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)