5d5658a1d3
This commit changes GDB to track thread numbers per-inferior. Then, if you're debugging multiple inferiors, GDB displays "inferior-num.thread-num" instead of just "thread-num" whenever it needs to display a thread: (gdb) info inferiors Num Description Executable 1 process 6022 /home/pedro/gdb/tests/threads * 2 process 6037 /home/pedro/gdb/tests/threads (gdb) info threads Id Target Id Frame 1.1 Thread 0x7ffff7fc2740 (LWP 6022) "threads" (running) 1.2 Thread 0x7ffff77c0700 (LWP 6028) "threads" (running) 1.3 Thread 0x7ffff7fc2740 (LWP 6032) "threads" (running) 2.1 Thread 0x7ffff7fc1700 (LWP 6037) "threads" (running) 2.2 Thread 0x7ffff77c0700 (LWP 6038) "threads" (running) * 2.3 Thread 0x7ffff7fc2740 (LWP 6039) "threads" (running) (gdb) ... (gdb) thread 1.1 [Switching to thread 1.1 (Thread 0x7ffff7fc2740 (LWP 8155))] (gdb) ... etc. You can still use "thread NUM", in which case GDB infers you're referring to thread NUM of the current inferior. The $_thread convenience var and Python's InferiorThread.num attribute are remapped to the new per-inferior thread number. It's a backward compatibility break, but since it only matters when debugging multiple inferiors, I think it's worth doing. Because MI thread IDs need to be a single integer, we keep giving threads a global identifier, _in addition_ to the per-inferior number, and make MI always refer to the global thread IDs. IOW, nothing changes from a MI frontend's perspective. Similarly, since Python's Breakpoint.thread and Guile's breakpoint-thread/set-breakpoint-thread breakpoint methods need to work with integers, those are adjusted to work with global thread IDs too. Follow up patches will provide convenient means to access threads' global IDs. To avoid potencially confusing users (which also avoids updating much of the testsuite), if there's only one inferior and its ID is "1", IOW, the user hasn't done anything multi-process/inferior related, then the "INF." part of thread IDs is not shown. E.g,.: (gdb) info inferiors Num Description Executable * 1 process 15275 /home/pedro/gdb/tests/threads (gdb) info threads Id Target Id Frame * 1 Thread 0x7ffff7fc1740 (LWP 15275) "threads" main () at threads.c:40 (gdb) add-inferior Added inferior 2 (gdb) info threads Id Target Id Frame * 1.1 Thread 0x7ffff7fc1740 (LWP 15275) "threads" main () at threads.c:40 (gdb) No regressions on x86_64 Fedora 20. gdb/ChangeLog: 2016-01-13 Pedro Alves <palves@redhat.com> * NEWS: Mention that thread IDs are now per inferior and global thread IDs. * Makefile.in (SFILES): Add tid-parse.c. (COMMON_OBS): Add tid-parse.o. (HFILES_NO_SRCDIR): Add tid-parse.h. * ada-tasks.c: Adjust to use ptid_to_global_thread_id. * breakpoint.c (insert_breakpoint_locations) (remove_threaded_breakpoints, bpstat_check_breakpoint_conditions) (print_one_breakpoint_location, set_longjmp_breakpoint) (check_longjmp_breakpoint_for_call_dummy) (set_momentary_breakpoint): Adjust to use global IDs. (find_condition_and_thread, watch_command_1): Use parse_thread_id. (until_break_command, longjmp_bkpt_dtor) (breakpoint_re_set_thread, insert_single_step_breakpoint): Adjust to use global IDs. * dummy-frame.c (pop_dummy_frame_bpt): Adjust to use ptid_to_global_thread_id. * elfread.c (elf_gnu_ifunc_resolver_stop): Likewise. * gdbthread.h (struct thread_info): Rename field 'num' to 'global_num. Add new fields 'per_inf_num' and 'inf'. (thread_id_to_pid): Rename thread_id_to_pid to global_thread_id_to_ptid. (pid_to_thread_id): Rename to ... (ptid_to_global_thread_id): ... this. (valid_thread_id): Rename to ... (valid_global_thread_id): ... this. (find_thread_id): Rename to ... (find_thread_global_id): ... this. (ALL_THREADS, ALL_THREADS_BY_INFERIOR): Declare. (print_thread_info): Add comment. * tid-parse.h: New file. * tid-parse.c: New file. * infcmd.c (step_command_fsm_prepare) (step_command_fsm_should_stop): Adjust to use the global thread ID. (until_next_command, until_next_command) (finish_command_fsm_should_stop): Adjust to use the global thread ID. (attach_post_wait): Adjust to check the inferior number too. * inferior.h (struct inferior) <highest_thread_num>: New field. * infrun.c (handle_signal_stop) (insert_exception_resume_breakpoint) (insert_exception_resume_from_probe): Adjust to use the global thread ID. * record-btrace.c (record_btrace_open): Use global thread IDs. * remote.c (process_initial_stop_replies): Also consider the inferior number. * target.c (target_pre_inferior): Clear the inferior's highest thread num. * thread.c (clear_thread_inferior_resources): Adjust to use the global thread ID. (new_thread): New inferior parameter. Adjust to use it. Set both the thread's global ID and the thread's per-inferior ID. (add_thread_silent): Adjust. (find_thread_global_id): New. (find_thread_id): Make static. Adjust to rename. (valid_thread_id): Rename to ... (valid_global_thread_id): ... this. (pid_to_thread_id): Rename to ... (ptid_to_global_thread_id): ... this. (thread_id_to_pid): Rename to ... (global_thread_id_to_ptid): ... this. Adjust. (first_thread_of_process): Adjust. (do_captured_list_thread_ids): Adjust to use global thread IDs. (should_print_thread): New function. (print_thread_info): Rename to ... (print_thread_info_1): ... this, and add new show_global_ids parameter. Handle it. Iterate over inferiors. (print_thread_info): Reimplement as wrapper around print_thread_info_1. (show_inferior_qualified_tids): New function. (print_thread_id): Use it. (tp_array_compar): Compare inferior numbers too. (thread_apply_command): Use tid_range_parser. (do_captured_thread_select): Use parse_thread_id. (thread_id_make_value): Adjust. (_initialize_thread): Adjust "info threads" help string. * varobj.c (struct varobj_root): Update comment. (varobj_create): Adjust to use global thread IDs. (value_of_root_1): Adjust to use global_thread_id_to_ptid. * windows-tdep.c (display_tib): No longer accept an argument. * cli/cli-utils.c (get_number_trailer): Make extern. * cli/cli-utils.h (get_number_trailer): Declare. (get_number_const): Adjust documentation. * mi/mi-cmd-var.c (mi_cmd_var_update_iter): Adjust to use global thread IDs. * mi/mi-interp.c (mi_new_thread, mi_thread_exit) (mi_on_normal_stop, mi_output_running_pid, mi_on_resume): * mi/mi-main.c (mi_execute_command, mi_cmd_execute): Likewise. * guile/scm-breakpoint.c (gdbscm_set_breakpoint_thread_x): Likewise. * python/py-breakpoint.c (bppy_set_thread): Likewise. * python/py-finishbreakpoint.c (bpfinishpy_init): Likewise. * python/py-infthread.c (thpy_get_num): Add comment and return the per-inferior thread ID. (thread_object_getset): Update comment of "num". gdb/testsuite/ChangeLog: 2016-01-07 Pedro Alves <palves@redhat.com> * gdb.base/break.exp: Adjust to output changes. * gdb.base/hbreak2.exp: Likewise. * gdb.base/sepdebug.exp: Likewise. * gdb.base/watch_thread_num.exp: Likewise. * gdb.linespec/keywords.exp: Likewise. * gdb.multi/info-threads.exp: Likewise. * gdb.threads/thread-find.exp: Likewise. * gdb.multi/tids.c: New file. * gdb.multi/tids.exp: New file. gdb/doc/ChangeLog: 2016-01-07 Pedro Alves <palves@redhat.com> * gdb.texinfo (Threads): Document per-inferior thread IDs, qualified thread IDs, global thread IDs and thread ID lists. (Set Watchpoints, Thread-Specific Breakpoints): Adjust to refer to thread IDs. (Convenience Vars): Document the $_thread convenience variable. (Ada Tasks): Adjust to refer to thread IDs. (GDB/MI Async Records, GDB/MI Thread Commands, GDB/MI Ada Tasking Commands, GDB/MI Variable Objects): Update to mention global thread IDs. * guile.texi (Breakpoints In Guile) <breakpoint-thread/set-breakpoint-thread breakpoint>: Mention global thread IDs instead of thread IDs. * python.texi (Threads In Python): Adjust documentation of InferiorThread.num. (Breakpoint.thread): Mention global thread IDs instead of thread IDs.
This is a collection of tests for GDB. The file gdb/README contains basic instructions on how to run the testsuite, while this file documents additional options and controls that are available. The GDB wiki may also have some pages with ideas and suggestions. Running the Testsuite ********************* There are two ways to run the testsuite and pass additional parameters to DejaGnu. The first is to do `make check' in the main build directory and specifying the makefile variable `RUNTESTFLAGS': make check RUNTESTFLAGS='TRANSCRIPT=y gdb.base/a2-run.exp' The second is to cd to the testsuite directory and invoke the DejaGnu `runtest' command directly. cd testsuite make site.exp runtest TRANSCRIPT=y (The `site.exp' file contains a handful of useful variables like host and target triplets, and pathnames.) Running the Performance Tests ***************************** GDB Testsuite includes performance test cases, which are not run together with other test cases, because performance test cases are slow and need a quiet system. There are two ways to run the performance test cases. The first is to do `make check-perf' in the main build directory: make check-perf RUNTESTFLAGS="solib.exp SOLIB_COUNT=8" The second is to cd to the testsuite directory and invoke the DejaGnu `runtest' command directly. cd testsuite make site.exp runtest GDB_PERFTEST_MODE=both GDB_PERFTEST_TIMEOUT=4000 --directory=gdb.perf solib.exp SOLIB_COUNT=8 Only "compile", "run" and "both" are valid to GDB_PERFTEST_MODE. They stand for "compile tests only", "run tests only", and "compile and run tests" respectively. "both" is the default. GDB_PERFTEST_TIMEOUT specify the timeout, which is 3000 in default. The result of performance test is appended in `testsuite/perftest.log'. Testsuite Parameters ******************** The following parameters are DejaGNU variables that you can set to affect the testsuite run globally. TRANSCRIPT You may find it useful to have a transcript of the commands that the testsuite sends to GDB, for instance if GDB crashes during the run, and you want to reconstruct the sequence of commands. If the DejaGNU variable TRANSCRIPT is set (to any value), each invocation of GDB during the test run will get a transcript file written into the DejaGNU output directory. The file will have the name transcript.<n>, where <n> is an integer. The first line of the file shows the invocation command with all the options passed to it, while subsequent lines are the GDB commands. A `make check' might look like this: make check RUNTESTFLAGS=TRANSCRIPT=y The transcript may not be complete, as for instance tests of command completion may show only partial command lines. GDB By default, the testsuite exercises the GDB in the build directory, but you can set GDB to be a pathname to a different version. For instance, make check RUNTESTFLAGS=GDB=/usr/bin/gdb runs the testsuite on the GDB in /usr/bin. GDBSERVER You can set GDBSERVER to be a particular GDBserver of interest, so for instance make check RUNTESTFLAGS="GDB=/usr/bin/gdb GDBSERVER=/usr/bin/gdbserver" checks both the installed GDB and GDBserver. INTERNAL_GDBFLAGS Command line options passed to all GDB invocations. The default is "-nw -nx". `-nw' disables any of the windowed interfaces. `-nx' disables ~/.gdbinit, so that it doesn't interfere with the tests. This is actually considered an internal variable, and you won't normally want to change it. However, in some situations, this may be tweaked as a last resort if the testsuite doesn't have direct support for the specifics of your environment. The testsuite does not override a value provided by the user. As an example, when testing an installed GDB that has been configured with `--with-system-gdbinit', like by default, you do not want ~/.gdbinit to interfere with tests, but, you may want the system .gdbinit file loaded. As there's no way to ask the testsuite, or GDB, to load the system gdbinit but not ~/.gdbinit, a workaround is then to remove `-nx' from INTERNAL_GDBFLAGS, and point $HOME at a directory without a .gdbinit. For example: cd testsuite HOME=`pwd` runtest \ GDB=/usr/bin/gdb \ GDBSERVER=/usr/bin/gdbserver \ INTERNAL_GDBFLAGS=-nw GDB_PARALLEL When testing natively (that is, not with a remote host), you can run the GDB test suite in a fully parallel mode. In this mode, each .exp file runs separately and maybe simultaneously. The test suite will ensure that all the temporary files created by the test suite do not clash, by putting them into separate directories. This mode is primarily intended for use by the Makefile. To use this mode, set the GDB_PARALLEL on the runtest command line. Before starting the tests, you must ensure that the directories cache, outputs, and temp in the test suite build directory are either empty or have been deleted. cache in particular is used to share data across invocations of runtest, and files there may affect the test results. Note that the Makefile automatically does these deletions. GDB_INOTIFY For debugging parallel mode, it is handy to be able to see when a test case writes to a file outside of its designated output directory. If you have the inotify-tools package installed, you can set the GDB_INOTIFY variable on the runtest command line. This will cause the test suite to watch for parallel-unsafe file creations and report them, both to stdout and in the test suite log file. This setting is only meaningful in conjunction with GDB_PARALLEL. TESTS This variable is used to specify which set of tests to run. It is passed to make (not runtest) and its contents are a space separated list of tests to run. If using GNU make then the contents are wildcard-expanded using GNU make's $(wildcard) function. Test paths must be fully specified, relative to the "testsuite" subdirectory. This allows one to run all tests in a subdirectory by passing "gdb.subdir/*.exp", or more simply by using the check-gdb.subdir target in the Makefile. If for some strange reason one wanted to run all tests that begin with the letter "d" that is also possible: TESTS="*/d*.exp". Do not write */*.exp to specify all tests (assuming all tests are only nested one level deep, which is not necessarily true). This will pick up .exp files in ancillary directories like "lib" and "config". Instead write gdb.*/*.exp. Example: make -j10 check TESTS="gdb.server/[s-w]*.exp */x*.exp" If not using GNU make then the value is passed directly to runtest. If not specified, all tests are run. READ1 This make (not runtest) variable is used to specify whether the testsuite preloads the read1.so library into expect. Any non-empty value means true. See "Race detection" below. Race detection ************** The testsuite includes a mechanism that helps detect test races. For example, say the program running under expect outputs "abcd", and a test does something like this: expect { "a.*c" { } "b" { } "a" { } } Which case happens to match depends on what expect manages to read into its internal buffer in one go. If it manages to read three bytes or more, then the first case matches. If it manages to read two bytes, then the second case matches. If it manages to read only one byte, then the third case matches. To help detect these cases, the race detection mechanism preloads a library into expect that forces the `read' system call to always return at most 1 byte. To enable this, either pass a non-empty value in the READ1 make variable, or use the check-read1 make target instead of check. Examples: make -j10 check-read1 TESTS="*/paginate-*.exp" make -j10 check READ1="1" Testsuite Configuration *********************** It is possible to adjust the behavior of the testsuite by defining the global variables listed below, either in a `site.exp' file, or in a board file. gdb_test_timeout Defining this variable changes the default timeout duration used during communication with GDB. More specifically, the global variable used during testing is `timeout', but this variable gets reset to `gdb_test_timeout' at the beginning of each testcase, which ensures that any local change to `timeout' in a testcase does not affect subsequent testcases. This global variable comes in handy when the debugger is slower than normal due to the testing environment, triggering unexpected `TIMEOUT' test failures. Examples include when testing on a remote machine, or against a system where communications are slow. If not specifically defined, this variable gets automatically defined to the same value as `timeout' during the testsuite initialization. The default value of the timeout is defined in the file `testsuite/config/unix.exp' (at least for Unix hosts; board files may have their own values). gdb_reverse_timeout Defining this variable changes the default timeout duration when tests under gdb.reverse directory are running. Process record and reverse debugging is so slow that its tests have unexpected `TIMEOUT' test failures. This global variable is useful to bump up the value of `timeout' for gdb.reverse tests and doesn't cause any delay where actual failures happen in the rest of the testsuite. Board Settings ************** DejaGNU includes the concept of a "board file", which specifies testing details for a particular target (which are often bare circuit boards, thus the name). In the GDB testsuite specifically, the board file may include a number of "board settings" that test cases may check before deciding whether to exercise a particular feature. For instance, a board lacking any I/O devices, or perhaps simply having its I/O devices not wired up, should set `noinferiorio'. Here are the supported board settings: gdb,cannot_call_functions The board does not support inferior call, that is, invoking inferior functions in GDB. gdb,can_reverse The board supports reverse execution. gdb,no_hardware_watchpoints The board does not support hardware watchpoints. gdb,nofileio GDB is unable to intercept target file operations in remote and perform them on the host. gdb,noinferiorio The board is unable to provide I/O capability to the inferior. gdb,noresults A program will not return an exit code or result code (or the value of the result is undefined, and should not be looked at). gdb,nosignals The board does not support signals. gdb,skip_huge_test Skip time-consuming tests on the board with slow connection. gdb,skip_float_tests Skip tests related to floating point. gdb,use_precord The board supports process record. gdb_init_command gdb_init_commands Commands to send to GDB every time a program is about to be run. The first of these settings defines a single command as a string. The second defines a TCL list of commands being a string each. The commands are sent one by one in a sequence, first from `gdb_init_command', if any, followed by individual commands from `gdb_init_command', if any, in this list's order. gdb_server_prog The location of GDBserver. If GDBserver somewhere other than its default location is used in test, specify the location of GDBserver in this variable. The location is a file name for GDBserver, and may be either absolute or relative to the testsuite subdirectory of the build directory. in_proc_agent The location of the in-process agent (used for fast tracepoints and other special tests). If the in-process agent of interest is anywhere other than its default location, set this variable. The location is a filename, and may be either absolute or relative to the testsuite subdirectory of the build directory. noargs GDB does not support argument passing for inferior. no_long_long The board does not support type long long. use_cygmon The board is running the monitor Cygmon. use_gdb_stub The tests are running with a GDB stub. exit_is_reliable Set to true if GDB can assume that letting the program run to end reliably results in program exits being reported as such, as opposed to, e.g., the program ending in an infinite loop or the board crashing/resetting. If not set, this defaults to $use_gdb_stub. In other words, native targets are assumed reliable by default, and remote stubs assumed unreliable. gdb,predefined_tsv The predefined trace state variables the board has. gdb,no_thread_names The target doesn't support thread names. Testsuite Organization ********************** The testsuite is entirely contained in `gdb/testsuite'. The main directory of the testsuite includes some makefiles and configury, but these are minimal, and used for little besides cleaning up, since the tests themselves handle the compilation of the programs that GDB will run. The file `testsuite/lib/gdb.exp' contains common utility procs useful for all GDB tests, while the directory testsuite/config contains configuration-specific files, typically used for special-purpose definitions of procs like `gdb_load' and `gdb_start'. The tests themselves are to be found in directories named 'testsuite/gdb.* and subdirectories of those. The names of the test files must always end with ".exp". DejaGNU collects the test files by wildcarding in the test directories, so both subdirectories and individual files typically get chosen and run in alphabetical order. The following lists some notable types of subdirectories and what they are for. Since DejaGNU finds test files no matter where they are located, and since each test file sets up its own compilation and execution environment, this organization is simply for convenience and intelligibility. gdb.base This is the base testsuite. The tests in it should apply to all configurations of GDB (but generic native-only tests may live here). The test programs should be in the subset of C that is both valid ANSI/ISO C, and C++. gdb.<lang> Language-specific tests for any language besides C. Examples are gdb.cp for C++ and gdb.java for Java. gdb.<platform> Non-portable tests. The tests are specific to a specific configuration (host or target), such as eCos. gdb.arch Architecture-specific tests that are (usually) cross-platform. gdb.<subsystem> Tests that exercise a specific GDB subsystem in more depth. For instance, gdb.disasm exercises various disassemblers, while gdb.stabs tests pathways through the stabs symbol reader. gdb.perf GDB performance tests. Writing Tests ************* In many areas, the GDB tests are already quite comprehensive; you should be able to copy existing tests to handle new cases. Be aware that older tests may use obsolete practices but have not yet been updated. You should try to use `gdb_test' whenever possible, since it includes cases to handle all the unexpected errors that might happen. However, it doesn't cost anything to add new test procedures; for instance, gdb.base/exprs.exp defines a `test_expr' that calls `gdb_test' multiple times. Only use `send_gdb' and `gdb_expect' when absolutely necessary. Even if GDB has several valid responses to a command, you can use `gdb_test_multiple'. Like `gdb_test', `gdb_test_multiple' recognizes internal errors and unexpected prompts. Do not write tests which expect a literal tab character from GDB. On some operating systems (e.g. OpenBSD) the TTY layer expands tabs to spaces, so by the time GDB's output reaches `expect' the tab is gone. The source language programs do *not* need to be in a consistent style. Since GDB is used to debug programs written in many different styles, it's worth having a mix of styles in the testsuite; for instance, some GDB bugs involving the display of source lines might never manifest themselves if the test programs used GNU coding style uniformly. Some testcase results need more detailed explanation: KFAIL Use KFAIL for known problem of GDB itself. You must specify the GDB bug report number, as in these sample tests: kfail "gdb/13392" "continue to marker 2" or setup_kfail gdb/13392 "*-*-*" kfail "continue to marker 2" XFAIL Short for "expected failure", this indicates a known problem with the environment. This could include limitations of the operating system, compiler version, and other components. This example from gdb.base/attach-pie-misread.exp is a sanity check for the target environment: # On x86_64 it is commonly about 4MB. if {$stub_size > 25000000} { xfail "stub size $stub_size is too large" return } You should provide bug report number for the failing component of the environment, if such bug report is available, as with this example referring to a GCC problem: if {[test_compiler_info {gcc-[0-3]-*}] || [test_compiler_info {gcc-4-[0-5]-*}]} { setup_xfail "gcc/46955" *-*-* } gdb_test "python print ttype.template_argument(2)" "&C::c" Note that it is also acceptable, and often preferable, to avoid running the test at all. This is the better option if the limitation is intrinsic to the environment, rather than a bug expected to be fixed in the near future.