2018-01-01 05:43:02 +01:00
|
|
|
# Copyright 1997-2018 Free Software Foundation, Inc.
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
2007-08-23 20:14:19 +02:00
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
1999-06-29 01:04:32 +02:00
|
|
|
# (at your option) any later version.
|
2007-08-23 20:14:19 +02:00
|
|
|
#
|
1999-06-29 01:04:32 +02:00
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2007-08-23 20:14:19 +02:00
|
|
|
#
|
1999-06-29 01:04:32 +02:00
|
|
|
# You should have received a copy of the GNU General Public License
|
2008-01-29 23:47:20 +01:00
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
# Various tests of gdb's ability to follow the parent or child of a
|
|
|
|
# Unix vfork system call. A vfork parent is blocked until the child
|
|
|
|
# either execs or exits --- since those events take somewhat different
|
|
|
|
# code paths in GDB, both variants are exercised.
|
|
|
|
|
2012-05-03 04:05:15 +02:00
|
|
|
# Until "set follow-fork-mode" and "catch vfork" are implemented on
|
|
|
|
# other targets...
|
|
|
|
#
|
2015-12-21 18:51:54 +01:00
|
|
|
if {![istarget "*-linux*"]} then {
|
2012-05-03 04:05:15 +02:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2012-11-02 18:57:04 +01:00
|
|
|
standard_testfile
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2013-10-18 22:00:44 +02:00
|
|
|
set compile_options debug
|
|
|
|
|
|
|
|
if {[build_executable $testfile.exp $testfile $srcfile $compile_options] == -1} {
|
2016-12-01 21:47:50 +01:00
|
|
|
untested "failed to compile main testcase"
|
2012-11-02 18:57:04 +01:00
|
|
|
return -1
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
|
2012-11-02 18:57:04 +01:00
|
|
|
set testfile2 "vforked-prog"
|
|
|
|
set srcfile2 ${testfile2}.c
|
|
|
|
|
2013-10-18 22:00:44 +02:00
|
|
|
if {[build_executable $testfile.exp $testfile2 $srcfile2 $compile_options] == -1} {
|
2016-12-01 21:47:50 +01:00
|
|
|
untested "failed to compile secondary testcase"
|
2012-11-02 18:57:04 +01:00
|
|
|
return -1
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
# A few of these tests require a little more time than the standard
|
|
|
|
# timeout allows.
|
|
|
|
set oldtimeout $timeout
|
|
|
|
set timeout [expr "$timeout + 10"]
|
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
# Start with a fresh GDB, with verbosity enabled, and run to main. On
|
|
|
|
# error, behave as "return", so we don't try to continue testing with
|
|
|
|
# a borked session.
|
|
|
|
proc setup_gdb {} {
|
[testsuite] Remove BASEDIR
BASEDIR was added by https://sourceware.org/ml/gdb-patches/2013-10/msg00587.html
in order to handle the different directory layout in serial testing
and parallel testing. BASEDIR is "gdb.base" in serial testing and is
"outputs/gdb.base/TESTNAME" in parallel testing. However, it doesn't
work if the GDBserver is in remote target, like this,
$ make check RUNTESTFLAGS='--target_board=remote-gdbserver-on-localhost foll-vfork.exp foll-exec.exp'
FAIL: gdb.base/foll-exec.exp: continue to first exec catchpoint (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork and exec child follow, to main bp: continue to bp (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: finish (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork relations in info inferiors: continue to bp (the program exited)
these tests fail because the executable can't be found. With target
board native-gdbserver, the program is spawned this way,
spawn ../gdbserver/gdbserver --once :2347 /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/gdb.base/foll-vfork
so BASEDIR is correct. However, with target board
remote-gdbserver-on-localhost, the program is spawned
spawn /usr/bin/ssh -l yao localhost /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/../gdbserver/gdbserver --once :2346 /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/gdb.base/foll-vfork
so BASEDIR (either "gdb.base" or "outputs/gdb.base/TESTNAME") makes no
sense.
I had a fix that pass absolute directory to BASEDIR, but it assumes
that directory structure is the same on build and target, and it
doesn't work in remote host case. The current fix in this patch is
to get the directory from argv[0]. In any case, the program to be
exec'ed is at the same directory with the main program.
Note that these tests do "next N" to let program stop at the desired
line, but it is fragile, because GDB for different targets may skip
function prologue slightly differently, so I replace some of them by
"tbreak on LINE NUMBER and continue".
gdb/testsuite:
2016-02-04 Yao Qi <yao.qi@linaro.org>
* gdb.base/foll-exec-mode.c: Include limits.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.base/foll-exec-mode.exp: Don't pass -DBASEDIR in
compilation.
* gdb.base/foll-exec.c: Include limits.h.
(main): Add parameters argc and argv.
Get directory from argv[0].
* gdb.base/foll-exec.exp: Don't pass -DBASEDIR in compilation.
Adjust tests on the number of lines as source code changed.
* gdb.base/foll-vfork-exit.c: Include limits.h.
(main): Add one line of statement before vfork.
* gdb.base/foll-vfork.c: Include limits.h and string.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.base/foll-vfork.exp: Don't pass -DBASEDIR in compilation.
(setup_gdb): Set tbreak to skip some source lines.
* gdb.multi/bkpt-multi-exec.c: Include limits.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.multi/bkpt-multi-exec.exp: Don't pass -DBASEDIR in
compilation.
* gdb.multi/multi-arch-exec.c: Include limits.h and string.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.multi/multi-arch-exec.exp: Don't pass -DBASEDIR in
compilation.
2016-02-04 16:46:37 +01:00
|
|
|
global testfile srcfile
|
2012-11-02 19:02:01 +01:00
|
|
|
|
|
|
|
clean_restart $testfile
|
|
|
|
|
|
|
|
if ![runto_main] {
|
|
|
|
return -code return
|
|
|
|
}
|
[testsuite] Remove BASEDIR
BASEDIR was added by https://sourceware.org/ml/gdb-patches/2013-10/msg00587.html
in order to handle the different directory layout in serial testing
and parallel testing. BASEDIR is "gdb.base" in serial testing and is
"outputs/gdb.base/TESTNAME" in parallel testing. However, it doesn't
work if the GDBserver is in remote target, like this,
$ make check RUNTESTFLAGS='--target_board=remote-gdbserver-on-localhost foll-vfork.exp foll-exec.exp'
FAIL: gdb.base/foll-exec.exp: continue to first exec catchpoint (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork and exec child follow, to main bp: continue to bp (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: finish (the program exited)
FAIL: gdb.base/foll-vfork.exp: exec: vfork relations in info inferiors: continue to bp (the program exited)
these tests fail because the executable can't be found. With target
board native-gdbserver, the program is spawned this way,
spawn ../gdbserver/gdbserver --once :2347 /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/gdb.base/foll-vfork
so BASEDIR is correct. However, with target board
remote-gdbserver-on-localhost, the program is spawned
spawn /usr/bin/ssh -l yao localhost /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/../gdbserver/gdbserver --once :2346 /scratch/yao/gdb/build-git/x86_64/gdb/testsuite/gdb.base/foll-vfork
so BASEDIR (either "gdb.base" or "outputs/gdb.base/TESTNAME") makes no
sense.
I had a fix that pass absolute directory to BASEDIR, but it assumes
that directory structure is the same on build and target, and it
doesn't work in remote host case. The current fix in this patch is
to get the directory from argv[0]. In any case, the program to be
exec'ed is at the same directory with the main program.
Note that these tests do "next N" to let program stop at the desired
line, but it is fragile, because GDB for different targets may skip
function prologue slightly differently, so I replace some of them by
"tbreak on LINE NUMBER and continue".
gdb/testsuite:
2016-02-04 Yao Qi <yao.qi@linaro.org>
* gdb.base/foll-exec-mode.c: Include limits.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.base/foll-exec-mode.exp: Don't pass -DBASEDIR in
compilation.
* gdb.base/foll-exec.c: Include limits.h.
(main): Add parameters argc and argv.
Get directory from argv[0].
* gdb.base/foll-exec.exp: Don't pass -DBASEDIR in compilation.
Adjust tests on the number of lines as source code changed.
* gdb.base/foll-vfork-exit.c: Include limits.h.
(main): Add one line of statement before vfork.
* gdb.base/foll-vfork.c: Include limits.h and string.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.base/foll-vfork.exp: Don't pass -DBASEDIR in compilation.
(setup_gdb): Set tbreak to skip some source lines.
* gdb.multi/bkpt-multi-exec.c: Include limits.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.multi/bkpt-multi-exec.exp: Don't pass -DBASEDIR in
compilation.
* gdb.multi/multi-arch-exec.c: Include limits.h and string.h.
(main): Add parameters argc and argv. Get directory from
argv[0].
* gdb.multi/multi-arch-exec.exp: Don't pass -DBASEDIR in
compilation.
2016-02-04 16:46:37 +01:00
|
|
|
|
|
|
|
set tbreak_line [gdb_get_line_number " VFORK " $srcfile]
|
|
|
|
gdb_test "tbreak ${tbreak_line}"
|
|
|
|
gdb_continue_to_breakpoint ".*"
|
2012-11-02 19:02:01 +01:00
|
|
|
}
|
|
|
|
|
2008-01-29 23:47:20 +01:00
|
|
|
proc check_vfork_catchpoints {} {
|
|
|
|
global gdb_prompt
|
|
|
|
global has_vfork_catchpoints
|
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2008-01-29 23:47:20 +01:00
|
|
|
# Verify that the system supports "catch vfork".
|
|
|
|
gdb_test "catch vfork" "Catchpoint \[0-9\]* \\(vfork\\)" "insert first vfork catchpoint"
|
|
|
|
set has_vfork_catchpoints 0
|
|
|
|
gdb_test_multiple "continue" "continue to first vfork catchpoint" {
|
2010-01-11 Thiago Jung Bauermann <bauerman@br.ibm.com>
Convert hardware watchpoints to use breakpoint_ops.
gdb/
* breakpoint.h (breakpoint_ops) <insert>: Rename to...
<insert_location>: ... this. Return int instead of void.
Accept pointer to struct bp_location instead of pointer to
struct breakpoint. Adapt all implementations.
(breakpoint_ops) <remove>: Rename to...
<remove_location>: ... this. Accept pointer to struct bp_location
instead of pointer to struct breakpoint. Adapt all implementations.
* breakpoint.c (insert_catchpoint): Delete function.
(insert_bp_location): Call the watchpoint or catchpoint's
breakpoint_ops.insert method.
(remove_breakpoint_1): Call the watchpoint or catchpoint's
breakpoint_ops.remove method.
(insert_watchpoint, remove_watchpoint): New functions.
(watchpoint_breakpoint_ops): New structure.
(watch_command_1): Initialize the OPS field.
* inf-child.c (inf_child_insert_fork_catchpoint)
(inf_child_remove_fork_catchpoint, inf_child_insert_vfork_catchpoint)
(inf_child_remove_vfork_catchpoint, inf_child_insert_exec_catchpoint)
(inf_child_remove_exec_catchpoint, inf_child_set_syscall_catchpoint):
Delete functions.
(inf_child_target): Remove initialization of to_insert_fork_catchpoint,
to_remove_fork_catchpoint, to_insert_vfork_catchpoint,
to_remove_vfork_catchpoint, to_insert_exec_catchpoint,
to_remove_exec_catchpoint and to_set_syscall_catchpoint.
* target.c (update_current_target): Change default implementation of
to_insert_fork_catchpoint, to_remove_fork_catchpoint,
to_insert_vfork_catchpoint, to_remove_vfork_catchpoint,
to_insert_exec_catchpoint, to_remove_exec_catchpoint and
to_set_syscall_catchpoint to return_one.
(debug_to_insert_fork_catchpoint, debug_to_insert_vfork_catchpoint)
(debug_to_insert_exec_catchpoint): Report return value.
* target.h (to_insert_fork_catchpoint, to_insert_vfork_catchpoint)
(to_insert_exec_catchpoint): Change declaration to return int instead
of void.
gdb/testsuite/
* gdb.base/foll-exec.exp: Adapt to new error string when the catchpoint
type is not supported.
* gdb.base/foll-fork.exp: Likewise.
* gdb.base/foll-vfork.exp: Likewise.
2011-01-11 20:16:23 +01:00
|
|
|
-re ".*Your system does not support this type\r\nof catchpoint.*$gdb_prompt $" {
|
2008-01-29 23:47:20 +01:00
|
|
|
unsupported "continue to first vfork catchpoint"
|
|
|
|
}
|
|
|
|
-re ".*Catchpoint.*$gdb_prompt $" {
|
|
|
|
set has_vfork_catchpoints 1
|
|
|
|
pass "continue to first vfork catchpoint"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if {$has_vfork_catchpoints == 0} {
|
|
|
|
unsupported "vfork catchpoints"
|
|
|
|
return -code return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-06-29 01:04:32 +02:00
|
|
|
proc vfork_parent_follow_through_step {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork parent follow, through step" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork parent"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "step"
|
2012-11-02 18:57:04 +01:00
|
|
|
gdb_test_multiple "next" $test {
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re "\\\[Detaching after vfork from.*if \\(pid == 0\\).*$gdb_prompt " {
|
2012-11-02 19:00:00 +01:00
|
|
|
pass $test
|
2012-11-02 18:57:04 +01:00
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The child has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any gdb_expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
proc vfork_parent_follow_to_bp {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork parent follow, to bp" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
2008-01-29 23:47:20 +01:00
|
|
|
global srcfile
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork parent"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 18:57:45 +01:00
|
|
|
set bp_location [gdb_get_line_number "printf (\"I'm the proud parent of child"]
|
|
|
|
gdb_test "break ${srcfile}:${bp_location}" ".*" "break, vfork to bp"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "continue to bp"
|
2012-11-02 18:57:04 +01:00
|
|
|
gdb_test_multiple "continue" $test {
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re ".*\\\[Detaching after vfork from child process.*Breakpoint.*${bp_location}.*$gdb_prompt " {
|
2012-11-02 18:57:04 +01:00
|
|
|
pass $test
|
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The child has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
proc vfork_child_follow_to_exit {} {
|
|
|
|
with_test_prefix "vfork child follow, to exit" {
|
|
|
|
global gdb_prompt
|
|
|
|
|
|
|
|
setup_gdb
|
|
|
|
|
|
|
|
gdb_test_no_output "set follow-fork child"
|
|
|
|
|
|
|
|
set test "continue to child exit"
|
|
|
|
gdb_test_multiple "continue" $test {
|
|
|
|
-re "Couldn't get registers.*$gdb_prompt " {
|
2012-11-02 19:13:37 +01:00
|
|
|
# PR gdb/14766
|
2012-11-02 19:10:29 +01:00
|
|
|
fail "$test"
|
|
|
|
}
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re "\\\[Attaching after.* vfork to.*\\\[Detaching vfork parent .* after child exit.*$gdb_prompt " {
|
2012-11-02 19:10:29 +01:00
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# The parent has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any gdb_expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
|
|
|
}}
|
|
|
|
|
1999-06-29 01:04:32 +02:00
|
|
|
proc vfork_and_exec_child_follow_to_main_bp {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork and exec child follow, to main bp" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
2012-11-02 18:57:45 +01:00
|
|
|
global srcfile2
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork child"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 18:57:45 +01:00
|
|
|
set linenum [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}]
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "continue to bp"
|
2012-11-02 18:57:04 +01:00
|
|
|
gdb_test_multiple "continue" $test {
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re "\\\[Attaching after.* vfork to.*\\\[Detaching vfork parent.*xecuting new program.*Breakpoint.*vforked-prog.c:${linenum}.*$gdb_prompt " {
|
2012-11-02 18:57:04 +01:00
|
|
|
pass $test
|
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The parent has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any gdb_expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
proc vfork_and_exec_child_follow_through_step {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork and exec child follow, through step" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
2012-11-02 18:57:45 +01:00
|
|
|
global srcfile2
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork child"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "step over vfork"
|
2015-12-21 18:51:54 +01:00
|
|
|
|
|
|
|
# The ideal support is to be able to debug the child even
|
|
|
|
# before it execs. Thus, "next" lands on the next line after
|
|
|
|
# the vfork.
|
|
|
|
gdb_test_multiple "next" $test {
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re "\\\[Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " {
|
2015-12-21 18:51:54 +01:00
|
|
|
pass "$test"
|
2012-11-02 18:58:39 +01:00
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The parent has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
testsuite: Regression for foll-vfork.exp
fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit
commit fe33faff35a8ee19db823149e764e3373e603bb9
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue Dec 22 10:52:31 2015 -0500
Remove HP-UX reference in foll-vfork.exp
FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork
It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64.
-Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
-Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
So I have reverted it and just simplified the comment.
The third case is not necessary during testing but I have changed back all the
3 cases.
Pedro Alves:
I know it was that way before, but would you mind moving this to a helper
proc.
gdb/testsuite/ChangeLog
2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow)
(tcatch_vfork_then_child_follow_exec)
(tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork
identification.
2016-01-11 22:20:16 +01:00
|
|
|
proc continue_to_vfork {} {
|
|
|
|
global gdb_prompt
|
|
|
|
|
|
|
|
# A vfork catchpoint may stop in either "vfork" or "_vfork".
|
|
|
|
set test "continue to vfork"
|
|
|
|
gdb_test_multiple "continue" $test {
|
|
|
|
-re "vfork \\(\\) at .*$gdb_prompt $" {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-06-29 01:04:32 +02:00
|
|
|
proc tcatch_vfork_then_parent_follow {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork parent follow, finish after tcatch vfork" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
|
|
|
global srcfile
|
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork parent"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test "tcatch vfork" "Catchpoint .*(vfork).*"
|
testsuite: Regression for foll-vfork.exp
fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit
commit fe33faff35a8ee19db823149e764e3373e603bb9
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue Dec 22 10:52:31 2015 -0500
Remove HP-UX reference in foll-vfork.exp
FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork
It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64.
-Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
-Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
So I have reverted it and just simplified the comment.
The third case is not necessary during testing but I have changed back all the
3 cases.
Pedro Alves:
I know it was that way before, but would you mind moving this to a helper
proc.
gdb/testsuite/ChangeLog
2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow)
(tcatch_vfork_then_child_follow_exec)
(tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork
identification.
2016-01-11 22:20:16 +01:00
|
|
|
|
|
|
|
continue_to_vfork
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 18:57:45 +01:00
|
|
|
set linenum [gdb_get_line_number "pid = vfork ();"]
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "finish"
|
2012-11-02 18:57:04 +01:00
|
|
|
gdb_test_multiple "finish" $test {
|
2012-11-02 18:57:45 +01:00
|
|
|
-re "Run till exit from.*vfork.*0x\[0-9a-fA-F\]* in main .* at .*${srcfile}:${linenum}.*$gdb_prompt " {
|
2012-11-02 18:57:04 +01:00
|
|
|
pass $test
|
|
|
|
}
|
2008-11-20 18:17:59 +01:00
|
|
|
-re "Run till exit from.*__kernel_v?syscall.*0x\[0-9a-fA-F\]* in vfork .*$gdb_prompt " {
|
|
|
|
send_gdb "finish\n"
|
|
|
|
exp_continue
|
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The child has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
proc tcatch_vfork_then_child_follow_exec {} {
|
2012-11-02 19:00:00 +01:00
|
|
|
with_test_prefix "vfork child follow, finish after tcatch vfork" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
2008-01-29 23:47:20 +01:00
|
|
|
global srcfile
|
1999-06-29 01:04:32 +02:00
|
|
|
global srcfile2
|
|
|
|
|
2012-11-02 19:02:01 +01:00
|
|
|
setup_gdb
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test_no_output "set follow-fork child"
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
gdb_test "tcatch vfork" "Catchpoint .*(vfork).*"
|
testsuite: Regression for foll-vfork.exp
fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit
commit fe33faff35a8ee19db823149e764e3373e603bb9
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue Dec 22 10:52:31 2015 -0500
Remove HP-UX reference in foll-vfork.exp
FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork
It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64.
-Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
-Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
So I have reverted it and just simplified the comment.
The third case is not necessary during testing but I have changed back all the
3 cases.
Pedro Alves:
I know it was that way before, but would you mind moving this to a helper
proc.
gdb/testsuite/ChangeLog
2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow)
(tcatch_vfork_then_child_follow_exec)
(tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork
identification.
2016-01-11 22:20:16 +01:00
|
|
|
|
|
|
|
continue_to_vfork
|
2012-11-02 18:57:04 +01:00
|
|
|
|
2012-11-02 18:57:45 +01:00
|
|
|
set linenum1 [gdb_get_line_number "pid = vfork ();"]
|
|
|
|
set linenum2 [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}]
|
|
|
|
|
2012-11-02 19:00:00 +01:00
|
|
|
set test "finish"
|
2012-11-02 18:57:04 +01:00
|
|
|
gdb_test_multiple "finish" $test {
|
2012-11-02 18:57:45 +01:00
|
|
|
-re "Run till exit from.*vfork.*${srcfile}:${linenum1}.*$gdb_prompt " {
|
2012-11-02 18:57:04 +01:00
|
|
|
pass $test
|
|
|
|
}
|
2008-11-20 18:17:59 +01:00
|
|
|
-re "Run till exit from.*__kernel_v?syscall.*0x\[0-9a-fA-F\]* in vfork .*$gdb_prompt " {
|
|
|
|
send_gdb "finish\n"
|
|
|
|
exp_continue
|
|
|
|
}
|
2012-11-02 18:57:45 +01:00
|
|
|
-re "Run till exit from.*vfork.*${srcfile2}:${linenum2}.*$gdb_prompt " {
|
2012-11-02 18:57:04 +01:00
|
|
|
pass "$test (followed exec)"
|
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
# The parent has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
2012-11-02 19:00:00 +01:00
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
proc tcatch_vfork_then_child_follow_exit {} {
|
|
|
|
with_test_prefix "vfork child follow, finish after tcatch vfork" {
|
1999-06-29 01:04:32 +02:00
|
|
|
global gdb_prompt
|
2012-11-02 19:10:29 +01:00
|
|
|
global srcfile
|
|
|
|
|
|
|
|
setup_gdb
|
|
|
|
|
|
|
|
gdb_test_no_output "set follow-fork child"
|
|
|
|
|
|
|
|
gdb_test "tcatch vfork" "Catchpoint .*(vfork).*"
|
testsuite: Regression for foll-vfork.exp
fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit
commit fe33faff35a8ee19db823149e764e3373e603bb9
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue Dec 22 10:52:31 2015 -0500
Remove HP-UX reference in foll-vfork.exp
FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork
FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork
It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64.
-Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork
-Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
+Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M
52 pushq %rdi^M
Current language: auto^M
The current source language is "auto; currently asm".^M
-(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
+(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork
So I have reverted it and just simplified the comment.
The third case is not necessary during testing but I have changed back all the
3 cases.
Pedro Alves:
I know it was that way before, but would you mind moving this to a helper
proc.
gdb/testsuite/ChangeLog
2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow)
(tcatch_vfork_then_child_follow_exec)
(tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork
identification.
2016-01-11 22:20:16 +01:00
|
|
|
|
|
|
|
continue_to_vfork
|
2012-11-02 19:10:29 +01:00
|
|
|
|
|
|
|
set test "finish"
|
|
|
|
gdb_test_multiple "finish" $test {
|
|
|
|
-re "Run till exit from.*vfork.*exited normally.*$gdb_prompt " {
|
|
|
|
setup_kfail "gdb/14762" *-*-*
|
|
|
|
fail $test
|
|
|
|
}
|
|
|
|
-re "Run till exit from.*vfork.*pid = vfork \\(\\).*$gdb_prompt " {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
-re "Run till exit from.*__kernel_v?syscall.*0x\[0-9a-fA-F\]* in vfork .*$gdb_prompt " {
|
|
|
|
send_gdb "finish\n"
|
|
|
|
exp_continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# The parent has been detached; allow time for any output it might
|
|
|
|
# generate to arrive, so that output doesn't get confused with
|
|
|
|
# any expected debugger output from a subsequent testpoint.
|
|
|
|
#
|
|
|
|
exec sleep 1
|
|
|
|
}}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-05 19:56:45 +01:00
|
|
|
proc vfork_relations_in_info_inferiors { variant } {
|
|
|
|
with_test_prefix "vfork relations in info inferiors" {
|
|
|
|
global gdb_prompt
|
|
|
|
|
|
|
|
setup_gdb
|
|
|
|
|
|
|
|
gdb_test_no_output "set follow-fork child"
|
|
|
|
|
|
|
|
set test "step over vfork"
|
|
|
|
gdb_test_multiple "next" $test {
|
Enable 'set print inferior-events' and improve detach/fork/kill/exit messages
This patch aims to turn 'set print inferior-events' always on, and do
some cleanup on the messages printed by GDB when various inferior
events happen (attach, detach, fork, kill, exit).
To make sure that the patch is correct, I've tested it with a handful
of combinations of 'set follow-fork-mode', 'set detach-on-fork' and
'set print inferior-events'. In the end, I decided to make my
hand-made test into an official testcase. More on that below.
Using the following program as an example:
#include <unistd.h>
int main ()
{
fork ();
return 0;
}
We see the following outputs from the patched GDB:
- With 'set print inferior-events on':
(gdb) r
Starting program: a.out
[Detaching after fork from child process 27749]
[Inferior 1 (process 27745) exited normally]
(gdb)
- With 'set print inferior-events off':
(gdb) r
Starting program: a.out
[Inferior 1 (process 27823) exited normally]
(gdb)
Comparing this against an unpatched GDB:
- With 'set print inferior-events off' and 'set follow-fork-mode
child':
(gdb) r
Starting program: a.out
[Inferior 2 (process 5993) exited normally]
(gdb)
Compare this against an unpatched GDB:
(unpatched-gdb) r
Starting program: a.out
[New process 5702]
[Inferior 2 (process 5702) exited normally]
(unpatched-gdb)
It is possible to notice that, in this scenario, the patched GDB
will lose the '[New process %d]' message.
- With 'set print inferior-events on', 'set follow-fork-mode child'
and 'set detach-on-fork on':
(gdb) r
Starting program: a.out
[Attaching after process 27905 fork to child process 27909]
[New inferior 2 (process 27909)]
[Detaching after fork from parent process 27905]
[Inferior 1 (process 27905) detached]
[Inferior 2 (process 27909) exited normally]
(gdb)
Compare this output with an unpatched GDB, using the same settings:
(unpatched-gdb) r
Starting program: a.out
[New inferior 28033]
[Inferior 28029 detached]
[New process 28033]
[Inferior 2 (process 28033) exited normally]
[Inferior 28033 exited]
(unpatched-gdb)
As can be seen above, I've also made a few modifications to messages
that are printed when 'set print inferior-events' is on. For example,
a few of the messages did not contain the '[' and ']' as
prefix/suffix, which led to a few inconsistencies like:
Attaching after process 22995 fork to child process 22999.
[New inferior 22999]
Detaching after fork from child process 22999.
[Inferior 22995 detached]
[Inferior 2 (process 22999) exited normally]
So I took the opportunity and included the square brackets where
applicable. I have also made the existing messages more uniform, by
always printing "Inferior %d (process %d)..." where applicable. This
makes it easier to identify the inferior number and the PID number
from the messages.
As suggested by Pedro, the "[Inferior %d exited]" message from
'exit_inferior' has been removed, because it got duplicated when
'inferior-events' is on. I'm also using the
'add_{thread,inferior}_silent' versions (instead of their verbose
counterparts) on some locations, also to avoid duplicated messages.
For example, a patched GDB with 'set print inferior-events on', 'set
detach-on-fork on' and 'set follow-fork-mode child', but using
'add_thread', would print:
(gdb) run
Starting program: a.out
[Attaching after process 25088 fork to child process 25092.]
[New inferior 25092] <--- duplicated
[Detaching after fork from child process 25092.]
[Inferior 25088 detached]
[New process 25092] <--- duplicated
[Inferior 2 (process 25092) exited normally]
But if we use 'add_thread_silent' (with the same configuration as
before):
(gdb) run
Starting program: a.out
[Attaching after process 31606 fork to child process 31610]
[New inferior 2 (process 31610)]
[Detaching after fork from parent process 31606]
[Inferior 1 (process 31606) detached]
[Inferior 2 (process 31610) exited normally]
As for the tests, the configuration options being exercised are:
- follow-fork-mode: child/parent
- detach-on-fork: on/off
- print inferior-events: on/off
It was also necessary to perform adjustments on several testcases,
because the expected messages changed considerably.
Built and regtested on BuildBot, without regressions.
gdb/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print message when inferior has
been killed.
* inferior.c (print_inferior_events): Remove 'static'. Set as
'1'.
(add_inferior): Improve message printed when
'print_inferior_events' is on.
(exit_inferior): Remove message printed when
'print_inferior_events' is on.
(detach_inferior): Improve message printed when
'print_inferior_events' is on.
(initialize_inferiors): Use 'add_inferior_silent' to set
'current_inferior_'.
* inferior.h (print_inferior_events): Declare here as
'extern'.
* infrun.c (follow_fork_inferior): Print '[Attaching...]' or
'[Detaching...]' messages when 'print_inferior_events' is on.
Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']'
as prefix/suffix for messages. Remove periods. Fix erroneous
'Detaching after fork from child...', replace it by '... from
parent...'.
(handle_vfork_child_exec_or_exit): Add '[' and ']' as
prefix/suffix when printing 'Detaching...' messages. Print
them when 'print_inferior_events' is on.
* remote.c (remote_detach_1): Print message when detaching
from inferior and '!is_fork_parent'.
gdb/testsuite/ChangeLog:
2018-04-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.base/attach.exp: Likewise.
* gdb.base/catch-syscall.exp (check_for_program_end): Adjust
"gdb_continue_to_end".
(test_catch_syscall_with_wrong_args): Likewise.
* gdb.base/foll-fork.exp: Adjust regexps to match '[' and
']'. Don't set 'verbose' on.
* gdb.base/foll-vfork.exp: Likewise.
* gdb.base/fork-print-inferior-events.c: New file.
* gdb.base/fork-print-inferior-events.exp: New file.
* gdb.base/hook-stop.exp: Adjust regexps to expect for new
'[Inferior ... has been killed]' message.
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.base/solib-overlap.exp: Adjust regexps to expect for new
detach message.
* gdb.threads/kill.exp: Adjust regexps to expect for new kill
message.
* gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...'
regexps to expect for '[Inferior ... detached]' as well.
* gdb.threads/process-dies-while-detaching.exp: Likewise.
2018-01-31 01:09:42 +01:00
|
|
|
-re "\\\[Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " {
|
2012-11-05 19:56:45 +01:00
|
|
|
pass "$test"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gdb_test "info inferiors" \
|
2016-01-12 02:12:38 +01:00
|
|
|
".*is vfork parent of inferior 2.*is vfork child of inferior 1" \
|
2012-11-05 19:56:45 +01:00
|
|
|
"info inferiors shows vfork parent/child relation"
|
|
|
|
|
|
|
|
if { $variant == "exec" } {
|
|
|
|
global srcfile2
|
|
|
|
|
|
|
|
set linenum [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}]
|
|
|
|
set test "continue to bp"
|
|
|
|
gdb_test_multiple "continue" $test {
|
|
|
|
-re ".*xecuting new program.*Breakpoint.*vforked-prog.c:${linenum}.*$gdb_prompt " {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
set test "continue to child exit"
|
|
|
|
gdb_test_multiple "continue" $test {
|
|
|
|
-re "exited normally.*$gdb_prompt " {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set test "vfork relation no longer appears in info inferiors"
|
|
|
|
gdb_test_multiple "info inferiors" $test {
|
|
|
|
-re "is vfork child of inferior 1.*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
}
|
|
|
|
-re "is vfork parent of inferior 2.*$gdb_prompt $" {
|
|
|
|
fail $test
|
|
|
|
}
|
|
|
|
-re "$gdb_prompt $" {
|
|
|
|
pass $test
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}}
|
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
proc do_vfork_and_follow_parent_tests {} {
|
|
|
|
global gdb_prompt
|
2008-01-29 23:47:20 +01:00
|
|
|
|
1999-06-29 01:04:32 +02:00
|
|
|
# Try following the parent process by stepping through a call to
|
|
|
|
# vfork. Do this without catchpoints.
|
2012-11-02 19:02:01 +01:00
|
|
|
vfork_parent_follow_through_step
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
# Try following the parent process by setting a breakpoint on the
|
|
|
|
# other side of a vfork, and running to that point. Do this
|
|
|
|
# without catchpoints.
|
2012-11-02 19:02:01 +01:00
|
|
|
vfork_parent_follow_to_bp
|
1999-06-29 01:04:32 +02:00
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
# Try catching a vfork, and stepping out to the parent.
|
|
|
|
#
|
|
|
|
tcatch_vfork_then_parent_follow
|
|
|
|
}
|
|
|
|
|
|
|
|
proc do_vfork_and_follow_child_tests_exec {} {
|
1999-06-29 01:04:32 +02:00
|
|
|
# Try following the child process by just continuing through the
|
|
|
|
# vfork, and letting the parent's breakpoint on "main" be auto-
|
|
|
|
# magically reset in the child.
|
|
|
|
#
|
2012-11-02 19:02:01 +01:00
|
|
|
vfork_and_exec_child_follow_to_main_bp
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
# Try following the child process by stepping through a call to
|
|
|
|
# vfork. The child also executes an exec. Since the child cannot
|
|
|
|
# be debugged until after it has exec'd, and since there's a bp on
|
|
|
|
# "main" in the parent, and since the bp's for the parent are
|
|
|
|
# recomputed in the exec'd child, the step through a vfork should
|
|
|
|
# land us in the "main" for the exec'd child, too.
|
|
|
|
#
|
2012-11-02 19:02:01 +01:00
|
|
|
vfork_and_exec_child_follow_through_step
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
# Try catching a vfork, and stepping out to the child.
|
|
|
|
#
|
2012-11-02 19:10:29 +01:00
|
|
|
tcatch_vfork_then_child_follow_exec
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
# Test the ability to follow both child and parent of a vfork. Do
|
|
|
|
# this without catchpoints.
|
|
|
|
# ??rehrauer: NYI. Will add testpoints here when implemented.
|
|
|
|
#
|
|
|
|
|
|
|
|
# Test the ability to have the debugger ask the user at vfork-time
|
|
|
|
# whether to follow the parent, child or both. Do this without
|
|
|
|
# catchpoints.
|
|
|
|
# ??rehrauer: NYI. Will add testpoints here when implemented.
|
|
|
|
#
|
2012-11-05 19:56:45 +01:00
|
|
|
|
|
|
|
# Step over a vfork in the child, do "info inferiors" and check the
|
|
|
|
# parent/child relation is displayed. Run the child over the exec,
|
|
|
|
# and confirm the relation is no longer displayed in "info
|
|
|
|
# inferiors".
|
|
|
|
#
|
|
|
|
vfork_relations_in_info_inferiors "exec"
|
1999-06-29 01:04:32 +02:00
|
|
|
}
|
|
|
|
|
2012-11-02 19:10:29 +01:00
|
|
|
proc do_vfork_and_follow_child_tests_exit {} {
|
|
|
|
# Try following the child process by just continuing through the
|
|
|
|
# vfork, and letting the child exit.
|
|
|
|
#
|
|
|
|
vfork_child_follow_to_exit
|
|
|
|
|
|
|
|
# Try catching a vfork, and stepping out to the child.
|
|
|
|
#
|
|
|
|
tcatch_vfork_then_child_follow_exit
|
2012-11-05 19:56:45 +01:00
|
|
|
|
|
|
|
# Step over a vfork in the child, do "info inferiors" and check the
|
|
|
|
# parent/child relation is displayed. Run the child to completion,
|
|
|
|
# and confirm the relation is no longer displayed in "info
|
|
|
|
# inferiors".
|
|
|
|
#
|
|
|
|
vfork_relations_in_info_inferiors "exit"
|
2012-11-02 19:10:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
with_test_prefix "check vfork support" {
|
|
|
|
# Check that vfork catchpoints are supported, as an indicator for
|
|
|
|
# whether vfork-following is supported.
|
|
|
|
check_vfork_catchpoints
|
|
|
|
}
|
|
|
|
|
Extended-remote exec test
This patch updates several exec-related tests and some of the library
functions in order to get them running with extended-remote. There were
three changes that were required, as follows:
In gdb.base/foll-exec.exp, use 'clean_start' in place of proc 'zap_session'
to reset the state of the debugger between tests. This sets 'remote
exec-file' to execute the correct binary file in each subsequent test.
In gdb.base/pie-execl.exp, there is an expect statement with an expression
that is used to match output from both gdb and the program under debug.
For the remote target, this had to be split into two expressions, using
$inferior_spawn_id to match the output from the program.
Because I had encountered problems with extended-remote exec events in
non-stop mode in my manual testing, I added non-stop testing to the
non-ldr-exc-[1234].exp tests. In order to set non-stop mode for remote
targets, it is necessary to 'set non-stop on' after gdb has started, but
before it connects to gdbserver. This is done using 'save_vars' to set
non-stop mode in GDBFLAGS, so GDB sets non-stop mode on startup.
gdb/testsuite/ChangeLog:
* gdb.base/foll-exec.c: Add copyright header. Fix
formatting issues.
* gdb.base/foll-exec.exp (zap_session): Delete proc.
(do_exec_tests): Use clean_restart in place of zap_session,
and for test initialization. Fix formatting issues. Use
fail in place of perror.
* gdb.base/pie-execl.exp (main): Use 'inferior_spawn_id' in
an expect statement to match an expression with output from
the program under debug.
* gdb.threads/non-ldr-exc-1.exp (do_test, main): Add
non-stop tests and pass stop mode argument to clean_restart.
Use save_vars to enable non-stop in GDBFLAGS.
* gdb.threads/non-ldr-exc-2.exp: Likewise.
* gdb.threads/non-ldr-exc-3.exp: Likewise.
* gdb.threads/non-ldr-exc-4.exp: Likewise.
2015-09-11 20:06:02 +02:00
|
|
|
# Follow parent and follow child vfork tests with a child that execs.
|
|
|
|
with_test_prefix "exec" {
|
|
|
|
# These are tests of gdb's ability to follow the parent of a Unix
|
|
|
|
# vfork system call. The child will subsequently call a variant
|
|
|
|
# of the Unix exec system call.
|
|
|
|
do_vfork_and_follow_parent_tests
|
|
|
|
|
|
|
|
# These are tests of gdb's ability to follow the child of a Unix
|
|
|
|
# vfork system call. The child will subsequently call a variant
|
|
|
|
# of a Unix exec system call.
|
|
|
|
#
|
|
|
|
do_vfork_and_follow_child_tests_exec
|
2012-11-02 19:10:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
# Switch to test the case of the child exiting. We can't use
|
|
|
|
# standard_testfile here because we don't want to overwrite the binary
|
|
|
|
# of the previous tests.
|
|
|
|
set testfile "foll-vfork-exit"
|
|
|
|
set srcfile ${testfile}.c
|
|
|
|
set binfile [standard_output_file ${testfile}]
|
|
|
|
|
|
|
|
if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
|
|
|
|
untested "failed to build $testfile"
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
# Follow parent and follow child vfork tests with a child that exits.
|
|
|
|
with_test_prefix "exit" {
|
|
|
|
# These are tests of gdb's ability to follow the parent of a Unix
|
|
|
|
# vfork system call. The child will subsequently exit.
|
|
|
|
do_vfork_and_follow_parent_tests
|
|
|
|
|
|
|
|
# These are tests of gdb's ability to follow the child of a Unix
|
|
|
|
# vfork system call. The child will subsequently exit.
|
|
|
|
#
|
|
|
|
do_vfork_and_follow_child_tests_exit
|
|
|
|
}
|
1999-06-29 01:04:32 +02:00
|
|
|
|
|
|
|
set timeout $oldtimeout
|
|
|
|
return 0
|