This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC] 02/10 Don't trim ptids on fork/exec
- From: Pedro Alves <pedro at codesourcery dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 6 May 2008 16:46:36 +0100
- Subject: [RFC] 02/10 Don't trim ptids on fork/exec
With the previous patch in place, we notice that doing breakpoint_re_sets
over forks and execs breaks, due to the is_running check not finding the
inferior_ptid listed in the thread list, while evaluating breakpoint
conditions and expressions. This patch fixes it by storing and passing
around full ptids, instead of the trimmed pid only, while handling forks
and execs.
--
Pedro Alves
2008-05-06 Pedro Alves <pedro@codesourcery.com>
* target.h (struct target_waitstatus): Store related_pid as a ptid.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd):
Take a ptid_t.
* breakpoint.h (struct breakpoint): Change forked_inferior_pid
type to ptid.
* breakpoint.c (print_it_typical, bpstat_check_location)
(print_one_breakpoint_location, set_raw_breakpoint_without_location)
(create_fork_vfork_event_catchpoint): Adjust.
* infrun.c (fork_event): Change parent_pid and child_pid types to
ptid.
(follow_exec, inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): Take a ptid_t and don't trim it.
* linux-thread-db.c (thread_db_wait): Don't trim the returned ptid.
* linux-nat.c (linux_child_follow_fork): Adjust.
* inf-ptrace.c (inf_ptrace_wait): Adjust.
* inf-ttrace.c (inf_ttrace_wait): Adjust.
* win32-nat.c (get_win32_debug_event): Don't set related_pid.
---
gdb/breakpoint.c | 19 ++++++++++---------
gdb/breakpoint.h | 2 +-
gdb/inf-ptrace.c | 4 ++--
gdb/inf-ttrace.c | 15 ++++++++++++---
gdb/infrun.c | 26 +++++++++++++-------------
gdb/linux-nat.c | 4 ++--
gdb/linux-thread-db.c | 2 +-
gdb/target.h | 12 ++++++------
gdb/win32-nat.c | 4 ++--
9 files changed, 49 insertions(+), 39 deletions(-)
Index: src/gdb/target.h
===================================================================
--- src.orig/gdb/target.h 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/target.h 2008-05-06 12:53:18.000000000 +0100
@@ -91,13 +91,13 @@ enum target_waitkind
(e.g. it called load(2) on AIX). */
TARGET_WAITKIND_LOADED,
- /* The program has forked. A "related" process' ID is in
+ /* The program has forked. A "related" process' PTID is in
value.related_pid. I.e., if the child forks, value.related_pid
is the parent's ID. */
TARGET_WAITKIND_FORKED,
- /* The program has vforked. A "related" process's ID is in
+ /* The program has vforked. A "related" process's PTID is in
value.related_pid. */
TARGET_WAITKIND_VFORKED,
@@ -140,7 +140,7 @@ struct target_waitstatus
{
int integer;
enum target_signal sig;
- int related_pid;
+ ptid_t related_pid;
char *execd_pathname;
int syscall_id;
}
@@ -677,11 +677,11 @@ int target_write_memory_blocks (VEC(memo
/* From infrun.c. */
-extern int inferior_has_forked (int pid, int *child_pid);
+extern int inferior_has_forked (ptid_t pid, ptid_t *child_pid);
-extern int inferior_has_vforked (int pid, int *child_pid);
+extern int inferior_has_vforked (ptid_t pid, ptid_t *child_pid);
-extern int inferior_has_execd (int pid, char **execd_pathname);
+extern int inferior_has_execd (ptid_t pid, char **execd_pathname);
/* From exec.c */
Index: src/gdb/breakpoint.h
===================================================================
--- src.orig/gdb/breakpoint.h 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/breakpoint.h 2008-05-06 12:53:18.000000000 +0100
@@ -439,7 +439,7 @@ struct breakpoint
/* Process id of a child process whose forking triggered this
catchpoint. This field is only valid immediately after this
catchpoint has triggered. */
- int forked_inferior_pid;
+ ptid_t forked_inferior_pid;
/* Filename of a program whose exec triggered this catchpoint.
This field is only valid immediately after this catchpoint has
Index: src/gdb/breakpoint.c
===================================================================
--- src.orig/gdb/breakpoint.c 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/breakpoint.c 2008-05-06 12:53:18.000000000 +0100
@@ -2312,7 +2312,7 @@ print_it_typical (bpstat bs)
annotate_catchpoint (b->number);
printf_filtered (_("\nCatchpoint %d (forked process %d), "),
b->number,
- b->forked_inferior_pid);
+ ptid_get_pid (b->forked_inferior_pid));
return PRINT_SRC_AND_LOC;
break;
@@ -2320,7 +2320,7 @@ print_it_typical (bpstat bs)
annotate_catchpoint (b->number);
printf_filtered (_("\nCatchpoint %d (vforked process %d), "),
b->number,
- b->forked_inferior_pid);
+ ptid_get_pid (b->forked_inferior_pid));
return PRINT_SRC_AND_LOC;
break;
@@ -2812,17 +2812,17 @@ bpstat_check_location (const struct bp_l
return 0;
if ((b->type == bp_catch_fork)
- && !inferior_has_forked (PIDGET (inferior_ptid),
+ && !inferior_has_forked (inferior_ptid,
&b->forked_inferior_pid))
return 0;
if ((b->type == bp_catch_vfork)
- && !inferior_has_vforked (PIDGET (inferior_ptid),
+ && !inferior_has_vforked (inferior_ptid,
&b->forked_inferior_pid))
return 0;
if ((b->type == bp_catch_exec)
- && !inferior_has_execd (PIDGET (inferior_ptid), &b->exec_pathname))
+ && !inferior_has_execd (inferior_ptid, &b->exec_pathname))
return 0;
return 1;
@@ -3650,10 +3650,11 @@ print_one_breakpoint_location (struct br
if (addressprint)
ui_out_field_skip (uiout, "addr");
annotate_field (5);
- if (b->forked_inferior_pid != 0)
+ if (!ptid_equal (b->forked_inferior_pid, null_ptid))
{
ui_out_text (uiout, "process ");
- ui_out_field_int (uiout, "what", b->forked_inferior_pid);
+ ui_out_field_int (uiout, "what",
+ ptid_get_pid (b->forked_inferior_pid));
ui_out_spaces (uiout, 1);
}
break;
@@ -4322,7 +4323,7 @@ set_raw_breakpoint_without_location (enu
b->frame_id = null_frame_id;
b->dll_pathname = NULL;
b->triggered_dll_pathname = NULL;
- b->forked_inferior_pid = 0;
+ b->forked_inferior_pid = null_ptid;
b->exec_pathname = NULL;
b->ops = NULL;
b->condition_not_parsed = 0;
@@ -4695,7 +4696,7 @@ create_fork_vfork_event_catchpoint (int
b->addr_string = NULL;
b->enable_state = bp_enabled;
b->disposition = tempflag ? disp_del : disp_donttouch;
- b->forked_inferior_pid = 0;
+ b->forked_inferior_pid = null_ptid;
update_global_location_list ();
Index: src/gdb/infrun.c
===================================================================
--- src.orig/gdb/infrun.c 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/infrun.c 2008-05-06 12:53:18.000000000 +0100
@@ -297,8 +297,8 @@ static struct
enum target_waitkind kind;
struct
{
- int parent_pid;
- int child_pid;
+ ptid_t parent_pid;
+ ptid_t child_pid;
}
fork_event;
char *execd_pathname;
@@ -362,9 +362,9 @@ follow_inferior_reset_breakpoints (void)
/* EXECD_PATHNAME is assumed to be non-NULL. */
static void
-follow_exec (int pid, char *execd_pathname)
+follow_exec (ptid_t pid, char *execd_pathname)
{
- int saved_pid = pid;
+ ptid_t saved_pid = pid;
struct target_ops *tgt;
/* This is an exec event that we actually wish to pay attention to.
@@ -404,7 +404,7 @@ follow_exec (int pid, char *execd_pathna
gdb_flush (gdb_stdout);
generic_mourn_inferior ();
/* Because mourn_inferior resets inferior_ptid. */
- inferior_ptid = pid_to_ptid (saved_pid);
+ inferior_ptid = saved_pid;
if (gdb_sysroot && *gdb_sysroot)
{
@@ -1897,7 +1897,7 @@ handle_inferior_event (struct execution_
stop_signal = TARGET_SIGNAL_TRAP;
pending_follow.kind = ecs->ws.kind;
- pending_follow.fork_event.parent_pid = PIDGET (ecs->ptid);
+ pending_follow.fork_event.parent_pid = ecs->ptid;
pending_follow.fork_event.child_pid = ecs->ws.value.related_pid;
if (!ptid_equal (ecs->ptid, inferior_ptid))
@@ -1932,7 +1932,7 @@ handle_inferior_event (struct execution_
/* This causes the eventpoints and symbol table to be reset. Must
do this now, before trying to determine whether to stop. */
- follow_exec (PIDGET (inferior_ptid), pending_follow.execd_pathname);
+ follow_exec (inferior_ptid, pending_follow.execd_pathname);
xfree (pending_follow.execd_pathname);
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
@@ -4322,7 +4322,7 @@ discard_inferior_status (struct inferior
}
int
-inferior_has_forked (int pid, int *child_pid)
+inferior_has_forked (ptid_t pid, ptid_t *child_pid)
{
struct target_waitstatus last;
ptid_t last_ptid;
@@ -4332,7 +4332,7 @@ inferior_has_forked (int pid, int *child
if (last.kind != TARGET_WAITKIND_FORKED)
return 0;
- if (ptid_get_pid (last_ptid) != pid)
+ if (!ptid_equal (last_ptid, pid))
return 0;
*child_pid = last.value.related_pid;
@@ -4340,7 +4340,7 @@ inferior_has_forked (int pid, int *child
}
int
-inferior_has_vforked (int pid, int *child_pid)
+inferior_has_vforked (ptid_t pid, ptid_t *child_pid)
{
struct target_waitstatus last;
ptid_t last_ptid;
@@ -4350,7 +4350,7 @@ inferior_has_vforked (int pid, int *chil
if (last.kind != TARGET_WAITKIND_VFORKED)
return 0;
- if (ptid_get_pid (last_ptid) != pid)
+ if (!ptid_equal (last_ptid, pid))
return 0;
*child_pid = last.value.related_pid;
@@ -4358,7 +4358,7 @@ inferior_has_vforked (int pid, int *chil
}
int
-inferior_has_execd (int pid, char **execd_pathname)
+inferior_has_execd (ptid_t pid, char **execd_pathname)
{
struct target_waitstatus last;
ptid_t last_ptid;
@@ -4368,7 +4368,7 @@ inferior_has_execd (int pid, char **exec
if (last.kind != TARGET_WAITKIND_EXECD)
return 0;
- if (ptid_get_pid (last_ptid) != pid)
+ if (!ptid_equal (last_ptid, pid))
return 0;
*execd_pathname = xstrdup (last.value.execd_pathname);
Index: src/gdb/linux-thread-db.c
===================================================================
--- src.orig/gdb/linux-thread-db.c 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/linux-thread-db.c 2008-05-06 12:53:18.000000000 +0100
@@ -840,7 +840,7 @@ thread_db_wait (ptid_t ptid, struct targ
unpush_target (&thread_db_ops);
using_thread_db = 0;
- return pid_to_ptid (GET_PID (ptid));
+ return ptid;
}
/* If we do not know about the main thread yet, this would be a good time to
Index: src/gdb/linux-nat.c
===================================================================
--- src.orig/gdb/linux-nat.c 2008-05-06 12:22:31.000000000 +0100
+++ src/gdb/linux-nat.c 2008-05-06 12:53:18.000000000 +0100
@@ -568,7 +568,7 @@ linux_child_follow_fork (struct target_o
parent_pid = ptid_get_lwp (last_ptid);
if (parent_pid == 0)
parent_pid = ptid_get_pid (last_ptid);
- child_pid = last_status.value.related_pid;
+ child_pid = PIDGET (last_status.value.related_pid);
if (! follow_child)
{
@@ -1649,7 +1649,7 @@ linux_handle_extended_wait (struct lwp_i
_("wait returned unexpected status 0x%x"), status);
}
- ourstatus->value.related_pid = new_pid;
+ ourstatus->value.related_pid = ptid_build (new_pid, new_pid, 0);
if (event == PTRACE_EVENT_FORK)
ourstatus->kind = TARGET_WAITKIND_FORKED;
Index: src/gdb/inf-ptrace.c
===================================================================
--- src.orig/gdb/inf-ptrace.c 2008-05-06 12:54:45.000000000 +0100
+++ src/gdb/inf-ptrace.c 2008-05-06 13:04:10.000000000 +0100
@@ -399,7 +399,7 @@ inf_ptrace_wait (ptid_t ptid, struct tar
{
case PTRACE_FORK:
ourstatus->kind = TARGET_WAITKIND_FORKED;
- ourstatus->value.related_pid = pe.pe_other_pid;
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
/* Make sure the other end of the fork is stopped too. */
fpid = waitpid (pe.pe_other_pid, &status, 0);
@@ -414,7 +414,7 @@ inf_ptrace_wait (ptid_t ptid, struct tar
gdb_assert (pe.pe_other_pid == pid);
if (fpid == ptid_get_pid (inferior_ptid))
{
- ourstatus->value.related_pid = pe.pe_other_pid;
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
return pid_to_ptid (fpid);
}
Index: src/gdb/inf-ttrace.c
===================================================================
--- src.orig/gdb/inf-ttrace.c 2008-05-06 12:54:48.000000000 +0100
+++ src/gdb/inf-ttrace.c 2008-05-06 13:05:12.000000000 +0100
@@ -839,6 +839,7 @@ inf_ttrace_wait (ptid_t ptid, struct tar
lwpid_t lwpid = ptid_get_lwp (ptid);
ttstate_t tts;
struct thread_info *ti;
+ ptid_t related_ptid;
/* Until proven otherwise. */
ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
@@ -912,8 +913,11 @@ inf_ttrace_wait (ptid_t ptid, struct tar
break;
case TTEVT_FORK:
+ related_ptid = ptid_build (tts.tts_u.tts_fork.tts_fpid,
+ tts.tts_u.tts_fork.tts_flwpid, 0);
+
ourstatus->kind = TARGET_WAITKIND_FORKED;
- ourstatus->value.related_pid = tts.tts_u.tts_fork.tts_fpid;
+ ourstatus->value.related_pid = related_ptid;
/* Make sure the other end of the fork is stopped too. */
if (ttrace_wait (tts.tts_u.tts_fork.tts_fpid,
@@ -924,16 +928,21 @@ inf_ttrace_wait (ptid_t ptid, struct tar
gdb_assert (tts.tts_event == TTEVT_FORK);
if (tts.tts_u.tts_fork.tts_isparent)
{
+ related_ptid = ptid_build (tts.tts_u.tts_fork.tts_fpid,
+ tts.tts_u.tts_fork.tts_flwpid, 0);
ptid = ptid_build (tts.tts_pid, tts.tts_lwpid, 0);
- ourstatus->value.related_pid = tts.tts_u.tts_fork.tts_fpid;
+ ourstatus->value.related_pid = related_ptid;
}
break;
case TTEVT_VFORK:
gdb_assert (!tts.tts_u.tts_fork.tts_isparent);
+ related_ptid = ptid_build (tts.tts_u.tts_fork.tts_fpid,
+ tts.tts_u.tts_fork.tts_flwpid, 0);
+
ourstatus->kind = TARGET_WAITKIND_VFORKED;
- ourstatus->value.related_pid = tts.tts_u.tts_fork.tts_fpid;
+ ourstatus->value.related_pid = related_ptid;
/* HACK: To avoid touching the parent during the vfork, switch
away from it. */
Index: src/gdb/win32-nat.c
===================================================================
--- src.orig/gdb/win32-nat.c 2008-05-06 12:53:58.000000000 +0100
+++ src/gdb/win32-nat.c 2008-05-06 12:54:27.000000000 +0100
@@ -1300,7 +1300,7 @@ get_win32_debug_event (int pid, struct t
/* Kludge around a Windows bug where first event is a create
thread event. Caused when attached process does not have
a main thread. */
- retval = ourstatus->value.related_pid = fake_create_process ();
+ retval = fake_create_process ();
if (retval)
saw_create++;
}
@@ -1340,7 +1340,7 @@ get_win32_debug_event (int pid, struct t
/* Add the main thread */
th = win32_add_thread (main_thread_id,
current_event.u.CreateProcessInfo.hThread);
- retval = ourstatus->value.related_pid = current_event.dwThreadId;
+ retval = current_event.dwThreadId;
break;
case EXIT_PROCESS_DEBUG_EVENT: