From patchwork Fri May 3 23:12:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 32516 Received: (qmail 130746 invoked by alias); 3 May 2019 23:12:42 -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 130487 invoked by uid 89); 3 May 2019 23:12:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=caching X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.38) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 03 May 2019 23:12:37 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 64E7BCBB2 for ; Fri, 3 May 2019 18:12:36 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id MhM4hZYhHYTGMMhM4hdons; Fri, 03 May 2019 18:12:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DEkWaHFMKcThqLcKUngXuKcrUcxMafBEg/oKb28MkCc=; b=eh2NjMbKv7/XHkdTdHGfu4oSWZ 3RXJo+oxPf56dDXdn+CZSExqdKLdes579SIp7sG5yIOw4rRV9rKPPVAvg6tPwoW7VkUNtu/Az+vnf Bvvba4EYgs6Aly5NCjLWY17Ga; Received: from 97-122-168-123.hlrn.qwest.net ([97.122.168.123]:37502 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1hMhM4-003AAO-5y; Fri, 03 May 2019 18:12:36 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 11/31] Convert auxv.c to type-safe registry API Date: Fri, 3 May 2019 17:12:11 -0600 Message-Id: <20190503231231.8954-12-tom@tromey.com> In-Reply-To: <20190503231231.8954-1-tom@tromey.com> References: <20190503231231.8954-1-tom@tromey.com> This changes auxv.c to use the type-safe registry API. 2019-04-22 Tom Tromey * auxv.c (auxv_inferior_data): Move. Change type. (auxv_inferior_data_cleanup): Remove. (invalidate_auxv_cache_inf): Rewrite. (get_auxv_inferior_data, _initialize_auxv): Update. --- gdb/ChangeLog | 7 +++++++ gdb/auxv.c | 35 +++++------------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/gdb/auxv.c b/gdb/auxv.c index 13caa936651..5e0ff26ab1a 100644 --- a/gdb/auxv.c +++ b/gdb/auxv.c @@ -293,9 +293,6 @@ target_auxv_parse (gdb_byte **readptr, } -/* Per-inferior data key for auxv. */ -static const struct inferior_data *auxv_inferior_data; - /* Auxiliary Vector information structure. This is used by GDB for caching purposes for each inferior. This helps reduce the overhead of transfering data from a remote target to the local host. */ @@ -304,32 +301,15 @@ struct auxv_info gdb::optional data; }; -/* Handles the cleanup of the auxv cache for inferior INF. ARG is ignored. - Frees whatever allocated space there is to be freed and sets INF's auxv cache - data pointer to NULL. - - This function is called when the following events occur: inferior_appeared, - inferior_exit and executable_changed. */ - -static void -auxv_inferior_data_cleanup (struct inferior *inf, void *arg) -{ - struct auxv_info *info; - - info = (struct auxv_info *) inferior_data (inf, auxv_inferior_data); - if (info != NULL) - { - delete info; - set_inferior_data (inf, auxv_inferior_data, NULL); - } -} +/* Per-inferior data key for auxv. */ +static const struct inferior_key auxv_inferior_data; /* Invalidate INF's auxv cache. */ static void invalidate_auxv_cache_inf (struct inferior *inf) { - auxv_inferior_data_cleanup (inf, NULL); + auxv_inferior_data.clear (inf); } /* Invalidate current inferior's auxv cache. */ @@ -350,12 +330,11 @@ get_auxv_inferior_data (struct target_ops *ops) struct auxv_info *info; struct inferior *inf = current_inferior (); - info = (struct auxv_info *) inferior_data (inf, auxv_inferior_data); + info = auxv_inferior_data.get (inf); if (info == NULL) { - info = new auxv_info; + info = auxv_inferior_data.emplace (inf); info->data = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL); - set_inferior_data (inf, auxv_inferior_data, info); } return info; @@ -574,10 +553,6 @@ _initialize_auxv (void) _("Display the inferior's auxiliary vector.\n\ This is information provided by the operating system at program startup.")); - /* Set an auxv cache per-inferior. */ - auxv_inferior_data - = register_inferior_data_with_cleanup (NULL, auxv_inferior_data_cleanup); - /* Observers used to invalidate the auxv cache when needed. */ gdb::observers::inferior_exit.attach (invalidate_auxv_cache_inf); gdb::observers::inferior_appeared.attach (invalidate_auxv_cache_inf);