From patchwork Fri Sep 23 13:17:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jon Turney X-Patchwork-Id: 15952 Received: (qmail 47646 invoked by alias); 23 Sep 2016 13:17:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 47637 invoked by uid 89); 23 Sep 2016 13:17:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=sk:jontur, U*jon.turney, sk:jon.tur, jonturneydronecodeorguk X-HELO: out2-smtp.messagingengine.com Received: from out2-smtp.messagingengine.com (HELO out2-smtp.messagingengine.com) (66.111.4.26) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Sep 2016 13:17:45 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id EA8132076B for ; Fri, 23 Sep 2016 09:17:43 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 23 Sep 2016 09:17:43 -0400 Received: from [192.168.1.102] (host86-141-129-51.range86-141.btcentralplus.com [86.141.129.51]) by mail.messagingengine.com (Postfix) with ESMTPA id 89A4ACCE9F for ; Fri, 23 Sep 2016 09:17:43 -0400 (EDT) Subject: Re: [PATCH] Consolidate target_mourn_inferior between GDB and gdbserver To: gdb-patches@sourceware.org References: <1473655918-2101-1-git-send-email-sergiodj@redhat.com> <87h99cjzd0.fsf@redhat.com> From: Jon Turney Message-ID: <03f09c13-9fec-ee9a-adf9-95e9f0e81b91@dronecode.org.uk> Date: Fri, 23 Sep 2016 14:17:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <87h99cjzd0.fsf@redhat.com> On 19/09/2016 05:19, Sergio Durigan Junior wrote: > On Thursday, September 15 2016, Pedro Alves wrote: >> On 09/12/2016 05:51 AM, Sergio Durigan Junior wrote: >> Thanks, patch is OK. >> >>> I'd appreciate a special look at gdb/windows-nat.c's modification >>> because I wasn't really sure what to do there. It seemed to me that >>> maybe I should build a ptid out of the process information there, but >>> then I am almost sure the assertion on GDB's side would trigger. >> >> Just leave it passing inferior_ptid like all other places, which is >> a no-op. We're certain the assertion does not fail this way. > > Thanks, pushed. > > bc1e6c81d5b77d78282c47f6fd7f697e564a6eb6 This seems to miss one use of target_mourn_inferior() in windows-nat.c. > ../../gdb/windows-nat.c: In function ‘void windows_kill_inferior(target_ops*)’: > ../../gdb/windows-nat.c:2467:26: error: too few arguments to function ‘void target_mourn_inferior(ptid_t)’ > target_mourn_inferior (); /* Or just windows_mourn_inferior? */ > ^ Patch attached. From 75869cf539056bcff2351f698ccf79286d137cfb Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 23 Sep 2016 14:07:55 +0100 Subject: [PATCH] Fix a use of target_mourn_inferior in windows-nat.c One use of target_mourn_interior seems to have been missed in bc1e6c81 gdb/ChangeLog: 2016-09-23 Jon Turney * windows-nat.c (windows_delete_thread): Adjusting call to target_mourn_inferior to include ptid_t argument. Signed-off-by: Jon Turney --- gdb/ChangeLog | 5 +++++ gdb/windows-nat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ea14f04..c7a194f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-09-23 Jon Turney + + * windows-nat.c (windows_delete_thread): Adjusting call to + target_mourn_inferior to include ptid_t argument. + 2016-09-22 Edjunior Barbosa Machado * rs6000-tdep.c (ppc_process_record_op31): Fix diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 31a9ecb..c6a809b 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2464,7 +2464,7 @@ windows_kill_inferior (struct target_ops *ops) break; } - target_mourn_inferior (); /* Or just windows_mourn_inferior? */ + target_mourn_inferior (inferior_ptid); /* Or just windows_mourn_inferior? */ } static void