From patchwork Mon Jun 19 11:50:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 21073 Received: (qmail 16912 invoked by alias); 19 Jun 2017 11:50: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 15756 invoked by uid 89); 19 Jun 2017 11:50:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:2953 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 19 Jun 2017 11:50:53 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4C33C04B92D; Mon, 19 Jun 2017 11:50:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B4C33C04B92D Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B4C33C04B92D Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id D770D8199E; Mon, 19 Jun 2017 11:50:53 +0000 (UTC) Subject: [pushed] .gdb_index writer: close the file before unlinking it (Re: [pushed] Re: [PATCH 1/6] Code cleanup: C++ify .gdb_index producer.) To: Eli Zaretskii , Jan Kratochvil References: <149582312757.15869.18345460438195439402.stgit@host1.jankratochvil.net> <149582313928.15869.12647134810146005233.stgit@host1.jankratochvil.net> <8efc0742-1014-4fe0-6948-f40a9c5c4975@redhat.com> <20170618142530.GA3559@host1.jankratochvil.net> <83poe1xrdr.fsf@gnu.org> Cc: gdb-patches@sourceware.org, vleschuk@accesssoftek.com From: Pedro Alves Message-ID: Date: Mon, 19 Jun 2017 12:50:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <83poe1xrdr.fsf@gnu.org> On 06/18/2017 04:11 PM, Eli Zaretskii wrote: >> Date: Sun, 18 Jun 2017 16:25:30 +0200 >> From: Jan Kratochvil >> Cc: gdb-patches@sourceware.org, Victor Leschuk >> >> On Mon, 12 Jun 2017 18:08:07 +0200, Pedro Alves wrote: >>> + file_closer close_out_file (out_file); >>> + gdb::unlinker unlink_file (filename.c_str ()); >> >> I heard on MS-Windows one cannot delete a file which is still open. > > Depends on how it was open, but yeah, in general you are right. (Most > programs, especially those which were ported from Posix systems, open > files in a way that indeed precludes their deletion, because that's > what the MS implementation of 'open' does.) Yeah, I forgot/missed that here. I've pushed this in to fix it. From 16b7a7199881fa26fc863279bbf08741e5674b5d Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 19 Jun 2017 12:46:47 +0100 Subject: [PATCH] .gdb_index writer: close the file before unlinking it We should close the file before unlinking because on MS-Windows one cannot delete a file that is still open. I considered making 'gdb::unlinker::unlinker(const char *)' 'noexcept(true)' and then adding static_assert (noexcept (gdb::unlinker (filename.c_str ())), ""); but that doesn't really work because gdb::unlinker has a gdb_assert, which can throw a QUIT if/when the assertion fails. 'noexcept(true)' would cause GDB to abruptly terminate if/when the assertion fails. gdb/ChangeLog: 2017-06-19 Pedro Alves * dwarf2read.c (write_psymtabs_to_index): Construct file_closer after gdb::unlinker. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aaf4b89..c7cf410 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-06-19 Pedro Alves + + * dwarf2read.c (write_psymtabs_to_index): Construct file_closer + after gdb::unlinker. + 2017-06-19 Sergio Durigan Junior * mi/mi-cm-env.c (_initialize_mi_cmd_env): Use getenv instead of diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index abe14b2..2369d4b 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -23776,8 +23776,12 @@ write_psymtabs_to_index (struct objfile *objfile, const char *dir) if (!out_file) error (_("Can't open `%s' for writing"), filename.c_str ()); - file_closer close_out_file (out_file); + /* Order matters here; we want FILE to be closed before FILENAME is + unlinked, because on MS-Windows one cannot delete a file that is + still open. (Don't call anything here that might throw until + file_closer is created.) */ gdb::unlinker unlink_file (filename.c_str ()); + file_closer close_out_file (out_file); mapped_symtab symtab; data_buf cu_list;