From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 283B4385C426 for ; Thu, 16 Apr 2020 14:47:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 283B4385C426 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-m00wGqYWNHieeFouiMJT6Q-1; Thu, 16 Apr 2020 10:47:06 -0400 X-MC-Unique: m00wGqYWNHieeFouiMJT6Q-1 Received: by mail-ed1-f72.google.com with SMTP id u6so751826edq.11 for ; Thu, 16 Apr 2020 07:47:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=qupWfV7AwAXivpOP9L4+T5vKi47RV9TMIikN/13vBS4=; b=fvxTBgWqugoHv8zazHvM9aEVEkWlgih8yxQqxflWqNyKE02N0h89FuT6GtyLOaBs4i PNHF30f0gWbZs4E/KDNEQmyvy4WeDdHoZkFzOItvNhb3hc/DKU1gfXLDLy8oQN1UXB1z 4/Mh4pmZvZSvpcaZ/QNH9U93dlfU5Huai89i5dxyyMA/CZjbayM/SVk3IhXzJQIQRXew MRA7t6CYxrXyOqfiu0mNWjpZgkLx6uPxxTisPGMCCE1zsILSGpcYzYIVoCousVYG9f10 tSMyK3EKUMcMqPkVIgxRhiuJQ85e0uqxJQLrkADvCFE7QQZRMDSyvNDJPqMk7PZYTGmX 0Rkg== X-Gm-Message-State: AGi0PuYA6FBVicA2K4Jvpv/DhEN7QQJoD29uq/r4ATdAFKL4vACzDp9A eKS+z/P6uj0R7R6qF69nPCc/oWqtukkaG+CndigldA84hFv0rOvdycH8kfCimDZXg367TK/Hd49 n3YbUihprXeRxNYis8Lltow== X-Received: by 2002:aa7:c2d8:: with SMTP id m24mr8356158edp.342.1587048424636; Thu, 16 Apr 2020 07:47:04 -0700 (PDT) X-Google-Smtp-Source: APiQypIyzKI48DlZImvaP1kizFZ1fEhHPJA4QuhIKuhFVQefJucC9t1FROtr8Jmmzrxf4kezp7vjpg== X-Received: by 2002:aa7:c2d8:: with SMTP id m24mr8356139edp.342.1587048424406; Thu, 16 Apr 2020 07:47:04 -0700 (PDT) Received: from ?IPv6:2001:8a0:f909:7b00:56ee:75ff:fe8d:232b? ([2001:8a0:f909:7b00:56ee:75ff:fe8d:232b]) by smtp.gmail.com with ESMTPSA id l20sm832034edr.54.2020.04.16.07.47.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Apr 2020 07:47:03 -0700 (PDT) Subject: Re: [PATCH 03/28] Refactor delete_program_space as a destructor To: Simon Marchi , gdb-patches@sourceware.org References: <20200414175434.8047-1-palves@redhat.com> <20200414175434.8047-4-palves@redhat.com> <499a4344-14f9-d959-c0c7-af2d8a568606@simark.ca> From: Pedro Alves Message-ID: <262059eb-49af-ee69-0f19-d3166a44a151@redhat.com> Date: Thu, 16 Apr 2020 15:47:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <499a4344-14f9-d959-c0c7-af2d8a568606@simark.ca> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-23.9 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 16 Apr 2020 14:47:10 -0000 On 4/15/20 4:54 PM, Simon Marchi wrote: > On 2020-04-14 1:54 p.m., Pedro Alves via Gdb-patches wrote: >> +/* Adds a new empty program space to the program space list, and binds >> + it to ASPACE. Returns the pointer to the new object. */ > > You could take the opportunity to update this comment. At least, the "Return the pointer" > part is not really relevant for a constructor. > > Otherwise, this LGTM. > Thanks. Here's what I'm merging. >From 381ce63f2f010ef5c246be720ef177cf46a19179 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 16 Apr 2020 14:50:07 +0100 Subject: [PATCH] Refactor delete_program_space as a destructor Currently, while the program_space's ctor adds the new pspace to the pspaces list, the destructor doesn't remove the pspace from the pspace list. Instead, you're supposed to use delete_program_space, to both remove the pspace from the list, and deleting the pspace. This patch eliminates delete_program_space, and makes the pspace dtor remove the deleted pspace from the pspace list itself, i.e., makes the dtor do the mirror opposite of the ctor. I found this helps with a following patch that will allocate a mock program_space on the stack. It's easier to just let the regular dtor remove the mock pspace from the pspace list than arrange to call delete_program_space instead of the pspace dtor in that situation. While at it, move the ctor/dtor intro comments to the header file, and make the ctor explicit. gdb/ChangeLog: 2020-04-16 Pedro Alves * inferior.c (delete_inferior): Use delete operator directly instead of delete_program_space. * progspace.c (add_program_space): New, factored out from program_space::program_space. (remove_program_space): New, factored out from delete_program_space. (program_space::program_space): Remove intro comment. Rewrite. (program_space::~program_space): Remove intro comment. Call remove_program_space. (delete_program_space): Delete. * progspace.h (program_space::program_space): Make explicit. Move intro comment here, adjusted. (program_space::~program_space): Move intro comment here, adjusted. (delete_program_space): Remove. --- gdb/ChangeLog | 18 +++++++++++++ gdb/inferior.c | 2 +- gdb/progspace.c | 84 +++++++++++++++++++++++++++++---------------------------- gdb/progspace.h | 14 ++++++---- 4 files changed, 71 insertions(+), 47 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7ba862edd3..6c280e3f49 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2020-04-16 Pedro Alves + + * inferior.c (delete_inferior): Use delete operator directly + instead of delete_program_space. + * progspace.c (add_program_space): New, factored out from + program_space::program_space. + (remove_program_space): New, factored out from + delete_program_space. + (program_space::program_space): Remove intro comment. Rewrite. + (program_space::~program_space): Remove intro comment. Call + remove_program_space. + (delete_program_space): Delete. + * progspace.h (program_space::program_space): Make explicit. Move + intro comment here, adjusted. + (program_space::~program_space): Move intro comment here, + adjusted. + (delete_program_space): Remove. + 2020-04-16 Tom Tromey * windows-nat.c (windows_nat::handle_access_violation): New diff --git a/gdb/inferior.c b/gdb/inferior.c index c2e9da3d3d..ceee00e9ee 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -162,7 +162,7 @@ delete_inferior (struct inferior *todel) /* If this program space is rendered useless, remove it. */ if (program_space_empty_p (inf->pspace)) - delete_program_space (inf->pspace); + delete inf->pspace; delete inf; } diff --git a/gdb/progspace.c b/gdb/progspace.c index 1361040347..6419f01770 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -109,36 +109,65 @@ init_address_spaces (void) -/* Adds a new empty program space to the program space list, and binds - it to ASPACE. Returns the pointer to the new object. */ +/* Add a program space from the program spaces list. */ -program_space::program_space (address_space *aspace_) -: num (++last_program_space_num), aspace (aspace_) +static void +add_program_space (program_space *pspace) { - program_space_alloc_data (this); - if (program_spaces == NULL) - program_spaces = this; + program_spaces = pspace; else { - struct program_space *last; + program_space *last; for (last = program_spaces; last->next != NULL; last = last->next) ; - last->next = this; + last->next = pspace; } } -/* Releases program space PSPACE, and all its contents (shared - libraries, objfiles, and any other references to the PSPACE in - other modules). It is an internal error to call this when PSPACE - is the current program space, since there should always be a - program space. */ +/* Remove a program space from the program spaces list. */ + +static void +remove_program_space (program_space *pspace) +{ + program_space *ss, **ss_link; + gdb_assert (pspace != NULL); + + ss = program_spaces; + ss_link = &program_spaces; + while (ss != NULL) + { + if (ss == pspace) + { + *ss_link = ss->next; + return; + } + + ss_link = &ss->next; + ss = *ss_link; + } +} + +/* See progspace.h. */ + +program_space::program_space (address_space *aspace_) + : num (++last_program_space_num), + aspace (aspace_) +{ + program_space_alloc_data (this); + + add_program_space (this); +} + +/* See progspace.h. */ program_space::~program_space () { gdb_assert (this != current_program_space); + remove_program_space (this); + scoped_restore_current_program_space restore_pspace; set_current_program_space (this); @@ -259,33 +288,6 @@ program_space_empty_p (struct program_space *pspace) return 1; } -/* Remove a program space from the program spaces list and release it. It is - an error to call this function while PSPACE is the current program space. */ - -void -delete_program_space (struct program_space *pspace) -{ - struct program_space *ss, **ss_link; - gdb_assert (pspace != NULL); - gdb_assert (pspace != current_program_space); - - ss = program_spaces; - ss_link = &program_spaces; - while (ss != NULL) - { - if (ss == pspace) - { - *ss_link = ss->next; - break; - } - - ss_link = &ss->next; - ss = *ss_link; - } - - delete pspace; -} - /* Prints the list of program spaces and their details on UIOUT. If REQUESTED is not -1, it's the ID of the pspace that should be printed. Otherwise, all spaces are printed. */ diff --git a/gdb/progspace.h b/gdb/progspace.h index 71a6f2841e..2b887847e1 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -209,7 +209,15 @@ struct unwrapping_objfile_range struct program_space { - program_space (address_space *aspace_); + /* Constructs a new empty program space, binds it to ASPACE, and + adds it to the program space list. */ + explicit program_space (address_space *aspace); + + /* Releases a program space, and all its contents (shared libraries, + objfiles, and any other references to the program space in other + modules). It is an internal error to call this when the program + space is the current program space, since there should always be + a program space. */ ~program_space (); typedef unwrapping_objfile_range objfiles_range; @@ -362,10 +370,6 @@ extern struct program_space *current_program_space; #define ALL_PSPACES(pspace) \ for ((pspace) = program_spaces; (pspace) != NULL; (pspace) = (pspace)->next) -/* Remove a program space from the program spaces list and release it. It is - an error to call this function while PSPACE is the current program space. */ -extern void delete_program_space (struct program_space *pspace); - /* Returns the number of program spaces listed. */ extern int number_of_program_spaces (void); base-commit: a010605fef0eba73c564c3dd22e0a6ecbc26b10e -- 2.14.5