From patchwork Sun Oct 2 17:04:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 58281 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 EA5FF385C32C for ; Sun, 2 Oct 2022 17:06:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA5FF385C32C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664730416; bh=TFsmOshZnWjJVju45Rep8QUlW12A6bWmGabaNMVMDAI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=VN0bavnZKqSVltqeyaTxl15MRkcKnttuLJONr9R7QxIJ8r5yLBM9o2OR5Qg30ZA9h eGZ3qiq7bBYqJ/RaPepQBKi/mT6Nj8ZbaqtoyfmgGiDUsYcYmBoiPT2ymjhL3e8ytC QmTaxnwX1Nc4LVkpEjkUPkBpmZd5xILeY1DCjRHQ= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id A7CDB3858C2C for ; Sun, 2 Oct 2022 17:04:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7CDB3858C2C 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-594-3ljVeDmZN4erDDez7Rykfw-1; Sun, 02 Oct 2022 13:04:56 -0400 X-MC-Unique: 3ljVeDmZN4erDDez7Rykfw-1 Received: by mail-wm1-f69.google.com with SMTP id c3-20020a7bc843000000b003b486fc6a40so2194626wml.7 for ; Sun, 02 Oct 2022 10:04:56 -0700 (PDT) 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; bh=TFsmOshZnWjJVju45Rep8QUlW12A6bWmGabaNMVMDAI=; b=tbLNVvWpzpEhLXaffKCDjP35Z8EMw/55775aHWt92TTFonAgP+uUXUkHm8sxEdhMo1 3HAkUyt6eG1zUQoJpSU7qVGtFYFGe+gPiF9jwTqXq9SxgUSnGOY/DzvPP0FksfOzrVAL g+415vDJsCY68KjKdv6e8yASHGjWWt1+g4Gd6CN1Ky4fIHV9+1wAiHY/eV1PjxGqtp+3 3fOcJ95uJ4pjEcgbB+Di3HQR/p2n3a3LGx6NJdOyM1Q2zM+mj7IuKxetv+feap6What0 HKfcwzOb0kiDXy+7nZXjTuJs23z4und+XNM5Txl4v7zgnOagJ7sMIHWrk1aNXIrxVPqr /gxg== X-Gm-Message-State: ACrzQf3yEGy8aAxFpT++RWC8JONEwVf/m0W5zQ3hU2gXuf9ifL6G9xmK XmtGvmkgdHw+amZz6RV2NUowl2mYG4i3wZRkpqUTnwjKAYMHEVco5h1+lmlrvBiG0B98djBFDZt giAdzOZAr97srJHSzwecKmCrmCcNIDvm8rMJf2MaCnsang9bE/drt3mzRAw5IpQyqztNDc/QWtA == X-Received: by 2002:a05:600c:35cf:b0:3b4:c0c2:d213 with SMTP id r15-20020a05600c35cf00b003b4c0c2d213mr4864531wmq.162.1664730295097; Sun, 02 Oct 2022 10:04:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7kPdrwY9zAMAtq9tsOuuLOea5ecnGaEL5I9gAMEPc3rUsIUVyPSV//Cs46h1vkriJYBIunaQ== X-Received: by 2002:a05:600c:35cf:b0:3b4:c0c2:d213 with SMTP id r15-20020a05600c35cf00b003b4c0c2d213mr4864518wmq.162.1664730294780; Sun, 02 Oct 2022 10:04:54 -0700 (PDT) Received: from localhost (52.72.115.87.dyn.plus.net. [87.115.72.52]) by smtp.gmail.com with ESMTPSA id q63-20020a1c4342000000b003b4bd18a23bsm14018629wma.12.2022.10.02.10.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 10:04:54 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCHv2 2/7] gdb: remove decref_target Date: Sun, 2 Oct 2022 18:04:43 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: <20220921131200.3983844-1-aburgess@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, 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 28560983625..9db44a83d55 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1158,7 +1158,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. */