From patchwork Fri Dec 2 20:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61396 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C9F2A385B192 for ; Fri, 2 Dec 2022 20:09:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9F2A385B192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670011797; bh=bqY5D4Vb0k6nTEHS/PVi43RGFL2B2haWCyY8p+Pl9E4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ScEYz0TBQVrzEqwfxCUZmh/HNHBdtrdXRNX+mnYBfTQ1JRlvoY/fKntgnfeakMvLX ZHmbFhENsQc6Ck/4hgnP6y2Mv10SYO48EFT4UfYlpr8ZEwFem5OP8wGKJbN1PG98HQ KC371qhe/bR1AuO0+mPvOS1Av4kBCiRQ/8/lUrnY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 2106E3858D39 for ; Fri, 2 Dec 2022 20:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2106E3858D39 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2K9RqB018577 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:09:32 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2K9RqB018577 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 5F3821E112; Fri, 2 Dec 2022 15:09:27 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/6] gdb/linux-nat: use get_ptrace_pid in two spots Date: Fri, 2 Dec 2022 15:09:20 -0500 Message-Id: <20221202200925.245955-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:09:27 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" No behavior change expected. Change-Id: Ifaa64ecd619483646b024fd7c62e571e92a8eedb --- gdb/linux-nat.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) base-commit: f9f593ddb2dee399e1ad24370c8e627aa4262524 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 17e5dce08c3d..9ab8b845cbb4 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -3611,20 +3611,16 @@ linux_xfer_siginfo (enum target_object object, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { - int pid; siginfo_t siginfo; gdb_byte inf_siginfo[sizeof (siginfo_t)]; gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO); gdb_assert (readbuf || writebuf); - pid = inferior_ptid.lwp (); - if (pid == 0) - pid = inferior_ptid.pid (); - if (offset > sizeof (siginfo)) return TARGET_XFER_E_IO; + int pid = get_ptrace_pid (inferior_ptid); errno = 0; ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, &siginfo); if (errno != 0) @@ -4446,11 +4442,7 @@ linux_nat_target::linux_nat_target () int linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo) { - int pid; - - pid = ptid.lwp (); - if (pid == 0) - pid = ptid.pid (); + int pid = get_ptrace_pid (ptid); errno = 0; ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, siginfo); From patchwork Fri Dec 2 20:09:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61395 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB52F38582BE for ; Fri, 2 Dec 2022 20:09:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB52F38582BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670011795; bh=RUowy8D9c55iEbpBtlsKAOzg6wZb8cE4cP8cdz1f/z0=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=geKn6+9SAZHjCvlXPgZBpHyYBxlWnNF5Ci5LsDaWjejJjTikObIIg9CFUgL6q9DZR 5BvzBns5LPT11YUAz/eMHvsOMq5LZ2YnbJqIBizq4bo9sbXUXBygPjC6Yih5DpUHJs OqGmWiGEN+iaqr4InJZCofsWYtAEEVNN4x9QRCMY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 65F813858C50 for ; Fri, 2 Dec 2022 20:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 65F813858C50 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2K9RAb018583 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:09:32 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2K9RAb018583 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 8CA4C1E11E; Fri, 2 Dec 2022 15:09:27 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/6] gdb/linux-nat: bool-ify linux_nat_get_siginfo Date: Fri, 2 Dec 2022 15:09:21 -0500 Message-Id: <20221202200925.245955-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202200925.245955-1-simon.marchi@polymtl.ca> References: <20221202200925.245955-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:09:27 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change return type to bool. Change-Id: I1bf0360bfdd1b5994cd0f96c268d806f96fe51a4 --- gdb/linux-nat.c | 6 +++--- gdb/linux-nat.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 9ab8b845cbb4..7b6a1f98d66d 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -4439,7 +4439,7 @@ linux_nat_target::linux_nat_target () /* See linux-nat.h. */ -int +bool linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo) { int pid = get_ptrace_pid (ptid); @@ -4449,9 +4449,9 @@ linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo) if (errno != 0) { memset (siginfo, 0, sizeof (*siginfo)); - return 0; + return false; } - return 1; + return true; } /* See nat/linux-nat.h. */ diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h index a9b91a5e908b..576924395e70 100644 --- a/gdb/linux-nat.h +++ b/gdb/linux-nat.h @@ -330,8 +330,8 @@ extern void linux_unstop_all_lwps (void); void linux_nat_switch_fork (ptid_t new_ptid); /* Store the saved siginfo associated with PTID in *SIGINFO. - Return 1 if it was retrieved successfully, 0 otherwise (*SIGINFO is + Return true if it was retrieved successfully, false otherwise (*SIGINFO is uninitialized in such case). */ -int linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo); +bool linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo); #endif /* LINUX_NAT_H */ From patchwork Fri Dec 2 20:09:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61398 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A05083858413 for ; Fri, 2 Dec 2022 20:10:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A05083858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670011823; bh=s2oPXfGyNzXFYAF8XGx454SkkfcdFktZaXZQL7Z6FXA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=TfeUBeSR730qsC9H4ONWED0ho2Fz5+z1A5/TKjvN9EHkTP6iBZBEWA68IpPUlDjHH n73ADYDNo/auRfBTD3hEuDGSp6iLhxGdWWRtrO7CC8c5AsdBvHz6QyojMtEWcddeoF JJJ+7DqtR0u9IbVPXimIV3lay7NiNv+5UzC19ewo= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8C7803858C52 for ; Fri, 2 Dec 2022 20:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C7803858C52 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2K9RLj018588 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:09:32 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2K9RLj018588 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id C30751E124; Fri, 2 Dec 2022 15:09:27 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/6] gdb/linux-nat: don't memset siginfo on failure in linux_nat_get_siginfo Date: Fri, 2 Dec 2022 15:09:22 -0500 Message-Id: <20221202200925.245955-3-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202200925.245955-1-simon.marchi@polymtl.ca> References: <20221202200925.245955-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:09:27 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" No caller cares about the value of *SIGINFO on failure. It's also documented in the function doc that *SIGINFO is uninitialized (I understand "untouched") on failure. Change-Id: I5ef38a5f58e3635e109b919ddf6f827f38f1225a --- gdb/linux-nat.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 7b6a1f98d66d..c47b8db9299c 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -4446,12 +4446,8 @@ linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo) errno = 0; ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, siginfo); - if (errno != 0) - { - memset (siginfo, 0, sizeof (*siginfo)); - return false; - } - return true; + + return errno == 0; } /* See nat/linux-nat.h. */ From patchwork Fri Dec 2 20:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61397 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF1883858434 for ; Fri, 2 Dec 2022 20:10:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF1883858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670011800; bh=b1gbXIcCFOQvG4/qgNNtYTTZI+/wFEcRFMgz36Jzgig=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RrBQuf8BhIRlulpBgn3wazBqDufctxFdCrMzNrQcbkYK+ObnTsi7y3Yq07OvKbY7u olcb3J2ZPKbLYsifbjrmF4f2tYIJ/vOZvZhU5YPkvH1EaDmdCmPAhHdStbS8scZ2lC ugs2vfCTh66ieCYJHHAK4Omkyo5poZAWOW4ooEHU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id C870B3858C53 for ; Fri, 2 Dec 2022 20:09:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C870B3858C53 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2K9SUs018596 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:09:32 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2K9SUs018596 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 0BB231E126; Fri, 2 Dec 2022 15:09:28 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/6] gdb/linux-nat: check ptrace return value in linux_nat_get_siginfo Date: Fri, 2 Dec 2022 15:09:23 -0500 Message-Id: <20221202200925.245955-4-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202200925.245955-1-simon.marchi@polymtl.ca> References: <20221202200925.245955-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:09:28 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Not a big deal, but it seems strange to check errno instead of the ptrace return value to know whether it succeeded. Change-Id: If0a6d0280ab0e5ecb077e546af0d6fe489c5b9fd --- gdb/linux-nat.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index c47b8db9299c..b33fac3d1492 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -4443,11 +4443,7 @@ bool linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo) { int pid = get_ptrace_pid (ptid); - - errno = 0; - ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, siginfo); - - return errno == 0; + return ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, siginfo) == 0; } /* See nat/linux-nat.h. */ From patchwork Fri Dec 2 20:09:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61400 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0250638582B7 for ; Fri, 2 Dec 2022 20:15:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0250638582B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670012100; bh=Yor3YnJi149guS9IQRzYvSVGsfw7bK6roP/6zUInjTA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=HMdg+3wA5NX0mp08D1GvetRXX4HBBwuwabCse2X6Lpk9p1vEzcTBPL9k85qcVpmj9 J24ncxPo1NSKk7QxoH4PPPcnmcOsg/6vr+RCsoAgoHYQ4gT2Oc0H6qlwfGLLvl11sC a/4IfcC9VdVn/Ufp/hZMEDat6yfHnBTAU2MmzPQY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 5BC333858D39 for ; Fri, 2 Dec 2022 20:14:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5BC333858D39 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2KEVYh028901 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:14:36 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2KEVYh028901 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 4D1211E128; Fri, 2 Dec 2022 15:09:28 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/6] gdb/linux-nat: use l linux_nat_get_siginfo in linux_xfer_siginfo Date: Fri, 2 Dec 2022 15:09:24 -0500 Message-Id: <20221202200925.245955-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202200925.245955-1-simon.marchi@polymtl.ca> References: <20221202200925.245955-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:14:31 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed we could reduce duplication a bit here. Change-Id: If24e54d1dac71b46f7c1f68a18a073d4c084b644 --- gdb/linux-nat.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index b33fac3d1492..aeb81cd01bd2 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -3620,10 +3620,7 @@ linux_xfer_siginfo (enum target_object object, if (offset > sizeof (siginfo)) return TARGET_XFER_E_IO; - int pid = get_ptrace_pid (inferior_ptid); - errno = 0; - ptrace (PTRACE_GETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, &siginfo); - if (errno != 0) + if (!linux_nat_get_siginfo (inferior_ptid, &siginfo)) return TARGET_XFER_E_IO; /* When GDB is built as a 64-bit application, ptrace writes into @@ -3646,6 +3643,7 @@ linux_xfer_siginfo (enum target_object object, /* Convert back to ptrace layout before flushing it out. */ siginfo_fixup (&siginfo, inf_siginfo, 1); + int pid = get_ptrace_pid (inferior_ptid); errno = 0; ptrace (PTRACE_SETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, &siginfo); if (errno != 0) From patchwork Fri Dec 2 20:09:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61399 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E028538582AC for ; Fri, 2 Dec 2022 20:14:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E028538582AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670012099; bh=uTbTEMGsUNDiwQ95muB1S5jhorUepHiyxS1+aNu9SeE=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ld4dEIKNt8L6cqqt3BR4z1ofafFQp2NbZ2lSkGm2e3Ti1SEEFamY8YxPI4A4urqLP 0+9DteYuSl38fODBozIjUPi8p1TpBIsISMpR6KB7+sl+7cSuIqrNw+ilhJyLMDzZcz PD6ev0H0fFolc7CfjsZqzQc6Djoip53lPVdsWGk4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 5C90A3858C52 for ; Fri, 2 Dec 2022 20:14:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5C90A3858C52 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2KEViQ028902 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:14:36 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2KEViQ028902 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id AB7681E129; Fri, 2 Dec 2022 15:09:28 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 6/6] gdb/linux-nat: add ptid parameter to linux_xfer_siginfo Date: Fri, 2 Dec 2022 15:09:25 -0500 Message-Id: <20221202200925.245955-6-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202200925.245955-1-simon.marchi@polymtl.ca> References: <20221202200925.245955-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 20:14:31 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Make the inferior_ptid bubble up to linux_nat_target::xfer_partial. Change-Id: I62dbc5734c26648bb465f449c2003c73751cd812 --- gdb/linux-nat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index aeb81cd01bd2..1d207c4e31d8 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -3606,7 +3606,7 @@ siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction) } static enum target_xfer_status -linux_xfer_siginfo (enum target_object object, +linux_xfer_siginfo (ptid_t ptid, enum target_object object, const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) @@ -3620,7 +3620,7 @@ linux_xfer_siginfo (enum target_object object, if (offset > sizeof (siginfo)) return TARGET_XFER_E_IO; - if (!linux_nat_get_siginfo (inferior_ptid, &siginfo)) + if (!linux_nat_get_siginfo (ptid, &siginfo)) return TARGET_XFER_E_IO; /* When GDB is built as a 64-bit application, ptrace writes into @@ -3643,7 +3643,7 @@ linux_xfer_siginfo (enum target_object object, /* Convert back to ptrace layout before flushing it out. */ siginfo_fixup (&siginfo, inf_siginfo, 1); - int pid = get_ptrace_pid (inferior_ptid); + int pid = get_ptrace_pid (ptid); errno = 0; ptrace (PTRACE_SETSIGINFO, pid, (PTRACE_TYPE_ARG3) 0, &siginfo); if (errno != 0) @@ -3672,7 +3672,7 @@ linux_nat_target::xfer_partial (enum target_object object, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { if (object == TARGET_OBJECT_SIGNAL_INFO) - return linux_xfer_siginfo (object, annex, readbuf, writebuf, + return linux_xfer_siginfo (inferior_ptid, object, annex, readbuf, writebuf, offset, len, xfered_len); /* The target is connected but no live inferior is selected. Pass