From patchwork Mon Dec 12 20:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 61842 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 DF6FC3874151 for ; Mon, 12 Dec 2022 20:33:51 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by sourceware.org (Postfix) with ESMTPS id 275A9384C346 for ; Mon, 12 Dec 2022 20:31:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 275A9384C346 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f44.google.com with SMTP id ja17so3690402wmb.3 for ; Mon, 12 Dec 2022 12:31:29 -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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5yIV+C/uSuT1lRrINJRlQIF8/VW+yW6dXdhgJWyjjXU=; b=GGx6+C1xjfvLWVxZHlmBbCi8imkxbrCHTWHxKg8p/r5ZdiOgxp2Z7zo4tY0KCfElbN af3fxbkIdoYteMvTTj6cYV/De6Jxt2Q43XSRYmMU7Qg6EJFbm43lVlupacBu+FfyV0sG cXvugmRZnzHxSTVuWWmcOoSeWHfvIZsWOu5NzTl9IQN30o9XWSryWQiMWn6e1dWc+P2O 9B8xRchv135K3pjAwVBdBasupWLHe+KpRYy5futPe8PpcTcv2qJNciu7h7+eXBQZMEbR RmSUDwDTPnxehkenls5QDbDv2doiH987Kn/0HKyyoiGQdHhRWmt94PYdj3iCsElOpzHe ocoQ== X-Gm-Message-State: ANoB5pnsmRiJVBHm5uYICFNq0OOW3uGtYVgJAYpQp4gPEH78RX+QHlrG HHDftBnnbTrUhSds1HDFSgi7crMWsqQ18w== X-Google-Smtp-Source: AA0mqf6vyNEVqbNAagKZVI6nY/Kfpk4xpQQA2njnGIwp4jyqYsuazdC74YPgFMu+7keksyM+E4vlWQ== X-Received: by 2002:a05:600c:4fd1:b0:3d0:6c60:b4d1 with SMTP id o17-20020a05600c4fd100b003d06c60b4d1mr16813062wmq.6.1670877088558; Mon, 12 Dec 2022 12:31:28 -0800 (PST) Received: from localhost ([2001:8a0:f912:6700:afd9:8b6d:223f:6170]) by smtp.gmail.com with ESMTPSA id f10-20020a7bcd0a000000b003d01b84e9b2sm10101761wmj.27.2022.12.12.12.31.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Dec 2022 12:31:28 -0800 (PST) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 22/31] gdbserver: Queue no-resumed event after thread exit Date: Mon, 12 Dec 2022 20:30:52 +0000 Message-Id: <20221212203101.1034916-23-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221212203101.1034916-1-pedro@palves.net> References: <20221212203101.1034916-1-pedro@palves.net> MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Normally, if the last thread resumed thread on the target exits, the server sends a no-resumed event to GDB. If however, GDB enables the GDB_THREAD_OPTION_EXIT option on a thread, and, that thread exits, the server sends a thread exit event for that thread instead. In all-stop RSP mode, since events can only be forwarded to GDB one at a time, and the whole target stops whenever an event is reported, GDB resumes the target again after getting a THREAD_EXITED event, and then the server finally reports back a no-resumed event if/when appropriate. For non-stop RSP though, events are asynchronous, and if the server sends a thread-exit event for the last resumed thread, the no-resumed event is never sent. This patch makes sure that in non-stop mode, the server queues a no-resumed event after the thread-exit event if it was the last resumed thread that exited. Without this, we'd see failures in step-over-thread-exit testcases added later in the series, like so: continue Continuing. - No unwaited-for children left. - (gdb) PASS: gdb.threads/step-over-thread-exit.exp: displaced-stepping=off: non-stop=on: target-non-stop=on: schedlock=off: ns_stop_all=1: continue stops when thread exits + FAIL: gdb.threads/step-over-thread-exit.exp: displaced-stepping=off: non-stop=on: target-non-stop=on: schedlock=off: ns_stop_all=1: continue stops when thread exits (timeout) (and other similar ones) Change-Id: I927d78b30f88236dbd5634b051a716f72420e7c7 Reviewed-By: Andrew Burgess --- gdbserver/linux-low.cc | 47 +++++++++++++++++++++++++----------------- gdbserver/linux-low.h | 2 ++ gdbserver/server.cc | 12 ++++++++++- gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 6 ++++++ 5 files changed, 53 insertions(+), 20 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index ebc3bf34127..bf6dc1d995a 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -2963,7 +2963,6 @@ linux_process_target::wait_1 (ptid_t ptid, target_waitstatus *ourstatus, int report_to_gdb; int trace_event; int in_step_range; - int any_resumed; threads_debug_printf ("[%s]", target_pid_to_str (ptid).c_str ()); @@ -2977,23 +2976,7 @@ linux_process_target::wait_1 (ptid_t ptid, target_waitstatus *ourstatus, in_step_range = 0; ourstatus->set_ignore (); - auto status_pending_p_any = [&] (thread_info *thread) - { - return status_pending_p_callback (thread, minus_one_ptid); - }; - - auto not_stopped = [&] (thread_info *thread) - { - return not_stopped_callback (thread, minus_one_ptid); - }; - - /* Find a resumed LWP, if any. */ - if (find_thread (status_pending_p_any) != NULL) - any_resumed = 1; - else if (find_thread (not_stopped) != NULL) - any_resumed = 1; - else - any_resumed = 0; + bool was_any_resumed = any_resumed (); if (step_over_bkpt == null_ptid) pid = wait_for_event (ptid, &w, options); @@ -3004,7 +2987,7 @@ linux_process_target::wait_1 (ptid_t ptid, target_waitstatus *ourstatus, pid = wait_for_event (step_over_bkpt, &w, options & ~WNOHANG); } - if (pid == 0 || (pid == -1 && !any_resumed)) + if (pid == 0 || (pid == -1 && !was_any_resumed)) { gdb_assert (target_options & TARGET_WNOHANG); @@ -6166,6 +6149,32 @@ linux_process_target::thread_stopped (thread_info *thread) return get_thread_lwp (thread)->stopped; } +bool +linux_process_target::any_resumed () +{ + bool any_resumed; + + auto status_pending_p_any = [&] (thread_info *thread) + { + return status_pending_p_callback (thread, minus_one_ptid); + }; + + auto not_stopped = [&] (thread_info *thread) + { + return not_stopped_callback (thread, minus_one_ptid); + }; + + /* Find a resumed LWP, if any. */ + if (find_thread (status_pending_p_any) != NULL) + any_resumed = 1; + else if (find_thread (not_stopped) != NULL) + any_resumed = 1; + else + any_resumed = 0; + + return any_resumed; +} + /* This exposes stop-all-threads functionality to other modules. */ void diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 1c1754d2b59..33a14e15173 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -259,6 +259,8 @@ class linux_process_target : public process_stratum_target bool thread_stopped (thread_info *thread) override; + bool any_resumed () override; + void pause_all (bool freeze) override; void unpause_all (bool unfreeze) override; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 5099db1ee31..77b4b57466d 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -4740,7 +4740,17 @@ handle_target_event (int err, gdb_client_data client_data) } } else - push_stop_notification (cs.last_ptid, cs.last_status); + { + push_stop_notification (cs.last_ptid, cs.last_status); + + if (cs.last_status.kind () == TARGET_WAITKIND_THREAD_EXITED + && !target_any_resumed ()) + { + target_waitstatus ws; + ws.set_no_resumed (); + push_stop_notification (null_ptid, ws); + } + } } /* Be sure to not change the selected thread behind GDB's back. diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 4584e9b3a8e..833e32a4830 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -612,6 +612,12 @@ process_stratum_target::thread_stopped (thread_info *thread) gdb_assert_not_reached ("target op thread_stopped not supported"); } +bool +process_stratum_target::any_resumed () +{ + return true; +} + bool process_stratum_target::supports_get_tib_address () { diff --git a/gdbserver/target.h b/gdbserver/target.h index e2e818b130b..c3345fc67e8 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -320,6 +320,9 @@ class process_stratum_target /* Return true if THREAD is known to be stopped now. */ virtual bool thread_stopped (thread_info *thread); + /* Return true if any thread is known to be resumed. */ + virtual bool any_resumed (); + /* Return true if the get_tib_address op is supported. */ virtual bool supports_get_tib_address (); @@ -683,6 +686,9 @@ target_read_btrace_conf (struct btrace_target_info *tinfo, #define target_supports_software_single_step() \ the_target->supports_software_single_step () +#define target_any_resumed() \ + the_target->any_resumed () + ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, target_wait_flags options, int connected_wait);