From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 645EB3857C44 for ; Wed, 5 Aug 2020 19:08:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 645EB3857C44 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 415F3116B47; Wed, 5 Aug 2020 15:08:46 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 5eZlyBHO1MWQ; Wed, 5 Aug 2020 15:08:46 -0400 (EDT) Received: from murgatroyd.Home (75-166-101-103.hlrn.qwest.net [75.166.101.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id F2D15116A6F; Wed, 5 Aug 2020 15:08:45 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 05/12] Change names given to Ravenscar threads Date: Wed, 5 Aug 2020 13:08:34 -0600 Message-Id: <20200805190841.2506771-6-tromey@adacore.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200805190841.2506771-1-tromey@adacore.com> References: <20200805190841.2506771-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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: Wed, 05 Aug 2020 19:08:47 -0000 Current a Ravenscar thread is given the same sort of name as a "CPU" thread; they can only be distinguished by looking at the output of "info thread". This patch changes ravenscar-thread.c to distinguish these threads, like: (gdb) continue Continuing. [New Ravenscar Thread 0x2b910] 2019-03-26 Tom Tromey * ravenscar-thread.c (ravenscar_thread_target) : Remove. (ravenscar_thread_target::extra_thread_info): Remove. (ravenscar_thread_target::pid_to_str): Mention Ravenscar in result; defer to target beneath for non-Ravenscar threads. --- gdb/ChangeLog | 8 ++++++++ gdb/ravenscar-thread.c | 13 ++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c index ee95a1c4bb8..dbcd4de81f8 100644 --- a/gdb/ravenscar-thread.c +++ b/gdb/ravenscar-thread.c @@ -109,8 +109,6 @@ struct ravenscar_thread_target final : public target_ops void update_thread_list () override; - const char *extra_thread_info (struct thread_info *) override; - std::string pid_to_str (ptid_t) override; ptid_t get_ada_task_ptid (long lwp, long thread) override; @@ -414,12 +412,6 @@ ravenscar_thread_target::active_task (int cpu) return ptid_t (m_base_ptid.pid (), 0, tid); } -const char * -ravenscar_thread_target::extra_thread_info (thread_info *tp) -{ - return "Ravenscar task"; -} - bool ravenscar_thread_target::thread_alive (ptid_t ptid) { @@ -430,7 +422,10 @@ ravenscar_thread_target::thread_alive (ptid_t ptid) std::string ravenscar_thread_target::pid_to_str (ptid_t ptid) { - return string_printf ("Thread %#x", (int) ptid.tid ()); + if (!is_ravenscar_task (ptid)) + return beneath ()->pid_to_str (ptid); + + return string_printf ("Ravenscar Thread %#x", (int) ptid.tid ()); } void -- 2.26.2