From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id yArnJ+/Z2GdQYxMAWB0awg (envelope-from ) for ; Mon, 17 Mar 2025 22:26:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=simark.ca; s=mail; t=1742264815; bh=fdr3zrmAXXGp8b8s++KN4/b/rNPmFNUS5b+MdxnYT+Y=; h=Date:Subject:To:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=QfQSjckng7d8031n2vp1RxzQL4x7ukDIVo79Qy7TiywWsdnJImjM+s7ZyKHtlRhVK I3sKQydVRqPicbc9lvS5VMKf3EWQ7fasgfsjJwi3TZXFJj8V0xUpI0691K0YP3yrIn BGrO3lbTer66GXTRebPZ7lq9X3v4XVjyvA4/ArvU= Received: by simark.ca (Postfix, from userid 112) id 9F08D1E100; Mon, 17 Mar 2025 22:26:55 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=4.0.1 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=simark.ca header.i=@simark.ca header.a=rsa-sha256 header.s=mail header.b=PVVz9z+O; dkim=pass (1024-bit key) header.d=simark.ca header.i=@simark.ca header.a=rsa-sha256 header.s=mail header.b=Tq+t/5/q; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 6F0AB1E05C for ; Mon, 17 Mar 2025 22:26:54 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2080F3858D3C for ; Tue, 18 Mar 2025 02:26:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2080F3858D3C Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=simark.ca header.i=@simark.ca header.a=rsa-sha256 header.s=mail header.b=PVVz9z+O; dkim=pass (1024-bit key) header.d=simark.ca header.i=@simark.ca header.a=rsa-sha256 header.s=mail header.b=Tq+t/5/q Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id A4B693858405 for ; Tue, 18 Mar 2025 02:16:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4B693858405 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A4B693858405 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264184; cv=none; b=LEDv7lK0Ok6lGK0pBWlGDzubRmGDIDAqSFxj7TayHrs/4wHQsgtJYDvwBDs4wFQS0mB5sVGob9bP6ZFeOj7zu61qogGbabSCeRQEbBs+/zoXTp0UHKwkIvmGoe0nZXB7v7Ax4nBKH0XaA9oOAHP/sRV17BQ1epXmsSlvOREFOog= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264184; c=relaxed/simple; bh=fdr3zrmAXXGp8b8s++KN4/b/rNPmFNUS5b+MdxnYT+Y=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version: Subject:To:From; b=sh97GmKccAfQri4ussldSUVK+zj4UTiN931USUKUcTS3vFvaJCGCaXlzyRLO7mhLIcenSxb6XKmZwsQfJfHKt0wHMTObyHmaze256z6/A2j5gjMrNdfGuVC+Mlv+5vHQz2iwpDvJfVNC08VjxNhDXsRAJtYnnfrxEyrZukTdGzs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4B693858405 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=simark.ca; s=mail; t=1742264179; bh=fdr3zrmAXXGp8b8s++KN4/b/rNPmFNUS5b+MdxnYT+Y=; h=Date:Subject:To:References:From:In-Reply-To:From; b=PVVz9z+OWpcfH812eFYyyRzA6610xmiUS0mODmb8a8wk+Ii6FDNW8GeqnyhQfKMlW J9yqxQa9g96nl5xL4KobG50i1xyJXWviMxYh2K6EszOzg5pxnzE21pMSwDIBlJLQI0 UT8LbToZ+OWxOHeDFavfYcDbv6CNGgvAmTRosIn4= Received: by simark.ca (Postfix, from userid 112) id 61C3A1E100; Mon, 17 Mar 2025 22:16:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=simark.ca; s=mail; t=1742264178; bh=fdr3zrmAXXGp8b8s++KN4/b/rNPmFNUS5b+MdxnYT+Y=; h=Date:Subject:To:References:From:In-Reply-To:From; b=Tq+t/5/qywMQyv5Bl5ozrMLElEmtMCUvQhlmoviS5cKwiSAhALMR0xTssjpNtwUgS Sn5lHTtPjdfZllTuwLJMjkr9bwKn2id3gEHIKhSsdCJbJ19cAtL5F8JFf9wrZvmDCL LJZrmfDNaWBz2BItIid8YeIsHrt2TY5SjJxBpyTA= Received: from [10.0.0.11] (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 0602F1E05C; Mon, 17 Mar 2025 22:16:17 -0400 (EDT) Message-ID: Date: Mon, 17 Mar 2025 22:16:17 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Use scoped_fd in linux-nat.c:proc_mem_file To: Tom Tromey , gdb-patches@sourceware.org References: <20250317205529.3885971-1-tom@tromey.com> Content-Language: en-US From: Simon Marchi In-Reply-To: <20250317205529.3885971-1-tom@tromey.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org On 2025-03-17 16:55, Tom Tromey wrote: > This changes linux-nat.c:proc_mem_file to use a scoped_fd and fixes up > the users. Regression tested on x86-64 Fedora 40. > --- > gdb/linux-nat.c | 29 +++++++++++++++-------------- > 1 file changed, 15 insertions(+), 14 deletions(-) > > diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c > index b16f9f96726..8861829f917 100644 > --- a/gdb/linux-nat.c > +++ b/gdb/linux-nat.c > @@ -4029,24 +4029,26 @@ linux_nat_target::pid_to_exec_file (int pid) > class proc_mem_file > { > public: > - proc_mem_file (ptid_t ptid, int fd) > - : m_ptid (ptid), m_fd (fd) > + proc_mem_file (ptid_t ptid, scoped_fd fd) > + : m_ptid (ptid), m_fd (std::move (fd)) > { > - gdb_assert (m_fd != -1); > + gdb_assert (m_fd.get () != -1); > } > > ~proc_mem_file () > { > linux_nat_debug_printf ("closing fd %d for /proc/%d/task/%ld/mem", > - m_fd, m_ptid.pid (), m_ptid.lwp ()); > - close (m_fd); > + m_fd.get (), m_ptid.pid (), m_ptid.lwp ()); > } > > DISABLE_COPY_AND_ASSIGN (proc_mem_file); > > - int fd () > + proc_mem_file (proc_mem_file &&) = default; > + proc_mem_file &operator= (proc_mem_file &&) = default; Is it really needed to add the move constructor / move assignment operator? In fact, I would think that you could remove the DISABLE_COPY_AND_ASSIGN, since just having the scoped_fd as a field will do the right thing. Otherwise, LGTM (Kevin already gave his AB). Simon