From patchwork Fri Nov 18 16:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 60844 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 583D73842308 for ; Fri, 18 Nov 2022 16:45:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 583D73842308 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668789936; bh=9Lhma4oYYhmfb1bNXAou5HMDnp3fe2lgTdoACa+UU7Y=; 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=yREUpTLSExr/PPRhZlonbukjAHsSr/Iao5ziPio5AML6kNkuNblmOWpF/jM9ZQU+3 YkJigfqgMrjaPU+4gzwq7CuhaNlCBWkWod1PJVhRYoosSVsbVrQlAt18fPG67569df QoBs6JXm6FasTu94vcl9jfHed9GrA9q8Ozxibvbk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D627C3851885 for ; Fri, 18 Nov 2022 16:43:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D627C3851885 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-101-2SCOeFMKPY6Nqcxn1PCerQ-1; Fri, 18 Nov 2022 11:43:06 -0500 X-MC-Unique: 2SCOeFMKPY6Nqcxn1PCerQ-1 Received: by mail-wm1-f69.google.com with SMTP id bg25-20020a05600c3c9900b003cf3ed7e27bso2493625wmb.4 for ; Fri, 18 Nov 2022 08:43:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Lhma4oYYhmfb1bNXAou5HMDnp3fe2lgTdoACa+UU7Y=; b=1U9amRloKu12n6k+AL/swuaPh3SHyC00pG5nO2UP7OhjWXWkEjiYi0Xlx+St+N1nJ1 LhptReKdlKWtRGzm/pBGE532fZMRCrsAYaT+qCpLkFuhmkT80FmchPJlOnEfGt7CkpFO A27nFxKFrd7r+JY3ibr1G0/2v4KczMhgyy+JDWHXEA4kP2NP5Sa3xzSmJkUipIp/jkqu +WLCqH9puiaz3eRUaBKPZFWe9igZAzlJp5FIDHaoc4ctbAWtIeyt5SakMS+ujSvLZ/ut 0GA9KYx9P5e1o1kp8EgztDwYO5T6g+N5884TmDKIEmwTD9yMwTlRa3bANJGIIefxdijZ Mk6A== X-Gm-Message-State: ANoB5plJLvsatMM2Sr7elz8Hu2dFQbyynZsN34cMODGGxbcHdMIzcPxH UIIPFGxtFK1RL0NVlCYoGHnIewjefs2FmTNAZ3BvYLpXYszZbLdadQu+3FG7si6Q5h5SlhoEG4k ih/vxzTqQM4RpNjEtQ807BC8f2P541dv0KLfLaAGKPzk44VqCpxKMZMl1RIbz32Pk/CxhV7TReQ == X-Received: by 2002:adf:f951:0:b0:23a:2311:b35 with SMTP id q17-20020adff951000000b0023a23110b35mr4706089wrr.183.1668789784842; Fri, 18 Nov 2022 08:43:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf66i1ZDuuRvTSwECeqYw3vvCe7EwqAolt415GUPfzXBOA7G+cpCNLNlayZEIyVoicYiSZDKog== X-Received: by 2002:adf:f951:0:b0:23a:2311:b35 with SMTP id q17-20020adff951000000b0023a23110b35mr4706074wrr.183.1668789784531; Fri, 18 Nov 2022 08:43:04 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id w3-20020a5d6803000000b00228d67db06esm3980872wru.21.2022.11.18.08.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 08:43:04 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv3 2/7] gdb: remove decref_target Date: Fri, 18 Nov 2022 16:42:53 +0000 Message-Id: <7c87022362c12d14247e3106f12018c0759848a1.1668789658.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The decref_target function is not really needed. Calling target_ops::decref will just redirect to decref_target anyway, so why not just rename decref_target to target_ops::decref? That's what this commit does. It's not exactly renaming to target_ops::decref, because the decref functionality is handled by a policy class, so the new name is now target_ops_ref_policy::decref. There should be no user visible change after this commit. --- gdb/target.c | 2 +- gdb/target.h | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gdb/target.c b/gdb/target.c index 74925e139dc..d7f742c83ec 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1157,7 +1157,7 @@ to_execution_direction must be implemented for reverse async"); /* See target.h. */ void -decref_target (target_ops *t) +target_ops_ref_policy::decref (target_ops *t) { t->decref (); if (t->refcount () == 0) diff --git a/gdb/target.h b/gdb/target.h index 28aa9273893..0f5038fb9b2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1337,9 +1337,6 @@ struct target_ops_deleter /* A unique pointer for target_ops. */ typedef std::unique_ptr target_ops_up; -/* Decref a target and close if, if there are no references left. */ -extern void decref_target (target_ops *t); - /* A policy class to interface gdb::ref_ptr with target_ops. */ struct target_ops_ref_policy @@ -1349,10 +1346,9 @@ struct target_ops_ref_policy t->incref (); } - static void decref (target_ops *t) - { - decref_target (t); - } + /* Decrement the reference count on T, and, if the reference count + reaches zero, close the target. */ + static void decref (target_ops *t); }; /* A gdb::ref_ptr pointer to a target_ops. */