From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6934 invoked by alias); 12 May 2010 04:19:52 -0000 Received: (qmail 6923 invoked by uid 22791); 12 May 2010 04:19:51 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,TW_BJ,TW_DF,TW_TP X-Spam-Check-By: sourceware.org Received: from mail-pw0-f41.google.com (HELO mail-pw0-f41.google.com) (209.85.160.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 12 May 2010 04:19:47 +0000 Received: by pwi10 with SMTP id 10so2958810pwi.0 for ; Tue, 11 May 2010 21:19:45 -0700 (PDT) Received: by 10.142.3.34 with SMTP id 34mr4436721wfc.193.1273637985554; Tue, 11 May 2010 21:19:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.4.9 with HTTP; Tue, 11 May 2010 21:19:25 -0700 (PDT) In-Reply-To: <4BE9F5EF.2050405@vmware.com> References: <4BE9DD78.6070209@vmware.com> <201005120105.40194.pedro@codesourcery.com> <4BE9F5EF.2050405@vmware.com> From: Hui Zhu Date: Wed, 12 May 2010 04:19:00 -0000 Message-ID: Subject: Re: [RFA] Checkpoint: wait the defunct process when delete it To: Michael Snyder , Pedro Alves Cc: "gdb-patches@sourceware.org" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-05/txt/msg00257.txt.bz2 On Wed, May 12, 2010 at 08:27, Michael Snyder wrote: > > Pedro Alves wrote: >> >> On Tuesday 11 May 2010 23:43:04, Michael Snyder wrote: >> >> >>> =A0 =A0 =A0old_cleanup =3D save_inferior_ptid (); >>> =A0 =A0 =A0inferior_ptid =3D fd->parent_ptid; >>> >>> Something like this? =A0Then the original inferior_ptid will be >>> restored when you do >>> >>>> + =A0if (call_function_by_hand (waitpid_fn, 3, argv) =3D=3D 0) >>>> + =A0 =A0return -1; >>> >>> =A0 =A0 =A0do_cleanups(); >>> >>>> + =A0return 0; >>>> +} >> >> That won't work. =A0You will hit an assertion somewhere: either because >> inferior_ptid is not found in the linux-nat.c lwp list, or because >> inferior_ptid is not found in gdb's thread list. =A0I believe you'll >> need to do a full linux_nat_switch_fork and back. >> > > There you go. =A0 ;-) > Hello guys, I am sorry that I didn't complete the new patch yesterday. Thanks for your help. According to your comments. I did following change: 1. Before kill the ptid, GDB switch to ptid and call "inferior_call_getppid" to get the ppid of this inferior. And save it to ppid. 2. before call "inferior_call_waitpid" to waitpid the ptid. Check if ppid is a simple thread. ppid > 1 Check if ppid is the GDB. If ppid is GDB, it will auto wait the ptid. ppid !=3D getpid () Check if ppid is stop. is_stopped (pptid) 3. In function inferior_call_waitpid, before call waitpid, swith to ppid. 4. If inferior_call_waitpid, just give a warning to user. Please help me review it. Best regards, Hui 2010-05-12 Hui Zhu * linux-fork.c (gdbthread.h): New include. (inferior_call_getppid, inferior_call_waitpid): New function. (delete_checkpoint_command): Call inferior_call_getppid and inferior_call_waitpid. --- linux-fork.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++- 1 file changed, 104 insertions(+), 1 deletion(-) --- a/linux-fork.c +++ b/linux-fork.c @@ -29,6 +29,7 @@ #include "gdb_string.h" #include "linux-fork.h" #include "linux-nat.h" +#include "gdbthread.h" #include #include "gdb_wait.h" @@ -410,12 +411,105 @@ linux_fork_detach (char *args, int from_ delete_fork (inferior_ptid); } +static int +inferior_call_getppid (ptid_t ptid) +{ + struct objfile *getppid_objf; + struct value *getppid_fn =3D NULL, *ret; + struct value *argv[4]; + struct gdbarch *gdbarch =3D get_current_arch (); + struct fork_info *oldfp, *newfp; + int ppid =3D 1; + + /* Switch to ptid. */ + oldfp =3D find_fork_ptid (inferior_ptid); + gdb_assert (oldfp !=3D NULL); + newfp =3D find_fork_ptid (ptid); + gdb_assert (oldfp !=3D NULL); + fork_save_infrun_state (oldfp, 1); + remove_breakpoints (); + fork_load_infrun_state (newfp); + insert_breakpoints (); + + /* Get the getppid_fn. */ + if (lookup_minimal_symbol ("getppid", NULL, NULL) !=3D NULL) + getppid_fn =3D find_function_in_inferior ("getppid", &getppid_objf); + if (!getppid_fn && lookup_minimal_symbol ("_getppid", NULL, NULL) !=3D N= ULL) + getppid_fn =3D find_function_in_inferior ("_getppid", &getppid_objf); + if (!getppid_fn) + return 1; + + ret =3D call_function_by_hand (getppid_fn, 0, NULL); + if (ret =3D=3D 0) + return ppid; + ppid =3D value_as_long (ret); + + /* Switch back to inferior_ptid. */ + remove_breakpoints (); + fork_load_infrun_state (oldfp); + insert_breakpoints (); + + return ppid; +} + +static int +inferior_call_waitpid (ptid_t pptid, int pid) +{ + struct objfile *waitpid_objf; + struct value *waitpid_fn =3D NULL; + struct value *argv[4]; + struct gdbarch *gdbarch =3D get_current_arch (); + struct fork_info *oldfp =3D NULL, *newfp =3D NULL; + int ret =3D 0; + + if (!ptid_equal (pptid, inferior_ptid)) + { + /* Switch to pptid. */ + oldfp =3D find_fork_ptid (inferior_ptid); + gdb_assert (oldfp !=3D NULL); + newfp =3D find_fork_ptid (pptid); + gdb_assert (oldfp !=3D NULL); + fork_save_infrun_state (oldfp, 1); + remove_breakpoints (); + fork_load_infrun_state (newfp); + insert_breakpoints (); + } + + /* Get the waitpid_fn. */ + if (lookup_minimal_symbol ("waitpid", NULL, NULL) !=3D NULL) + waitpid_fn =3D find_function_in_inferior ("waitpid", &waitpid_objf); + if (!waitpid_fn && lookup_minimal_symbol ("_waitpid", NULL, NULL) !=3D N= ULL) + waitpid_fn =3D find_function_in_inferior ("_waitpid", &waitpid_objf); + if (!waitpid_fn) + return -1; + + /* Get the argv. */ + argv[0] =3D value_from_longest (builtin_type (gdbarch)->builtin_int, pid= ); + argv[1] =3D value_from_longest (builtin_type (gdbarch)->builtin_data_ptr= , 0); + argv[2] =3D value_from_longest (builtin_type (gdbarch)->builtin_int, 0); + argv[3] =3D 0; + + if (call_function_by_hand (waitpid_fn, 3, argv) =3D=3D 0) + ret =3D -1; + + if (oldfp) + { + /* Switch back to inferior_ptid. */ + remove_breakpoints (); + fork_load_infrun_state (oldfp); + insert_breakpoints (); + } + + return ret; +} + /* Fork list <-> user interface. */ static void delete_checkpoint_command (char *args, int from_tty) { - ptid_t ptid; + ptid_t ptid, pptid; + int ppid; if (!args || !*args) error (_("Requires argument (checkpoint id to delete)")); @@ -428,9 +522,18 @@ delete_checkpoint_command (char *args, i error (_("\ Please switch to another checkpoint before deleting the current one")); + ppid =3D inferior_call_getppid (ptid); + pptid =3D ptid_build (ppid, ppid, 0); + if (ptrace (PTRACE_KILL, PIDGET (ptid), 0, 0)) error (_("Unable to kill pid %s"), target_pid_to_str (ptid)); + if (ppid > 1 && ppid !=3D getpid () && is_stopped (pptid)) + { + if (inferior_call_waitpid (pptid, PIDGET (ptid))) + warning (_("Unable to wait pid %s"), target_pid_to_str (ptid)); + } + if (from_tty) printf_filtered (_("Killed %s\n"), target_pid_to_str (ptid));