From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by sourceware.org (Postfix) with ESMTPS id 89ED8385771E for ; Mon, 13 Nov 2023 15:05:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89ED8385771E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 89ED8385771E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699887956; cv=none; b=wlLo0+XB4rLdmL6J/hjqU38r4ke6WRMvHfKXHP/52z5tJDhlF5tJaOxEvycY49IV5za949ITgcEcFvjLX/xWGBO6lbv9qHSoZPlGWdhITX8PYEwcDa1ixUWF8o9AHZSePj1KnF/9vrudMVKILvt1WDtdjMViE0jzCMAogKQTVj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699887956; c=relaxed/simple; bh=T5rFDK+WyNzCaEOgZUPPpI2zYHefY7Wlso7ykeBJHC0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=uVMZDn7MmtR3Bimp2nOH55DCe0yMxlq7E+kaLpIJ39JUMmOdXi3YTJ3wF8KV4v5BcG6FN2DT/ARQjEsz0OGV6tPJ8S0zxsKebm+8/1nmMMjNrt5vzEHHVadAh7RAVuXw3e3Dt2sraZEvcNJA+h6SvKG2IvCat2xKoaQfZTNX5qU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso37039835e9.3 for ; Mon, 13 Nov 2023 07:05:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699887953; x=1700492753; 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=Opl1uL07grG0lDR2br1kOqsCRxdvlsZGe9WpSsyPKWI=; b=HtfCY26TUfn50fOATIAWQ2tT0fnfcf9NE4KQO5AYVUir0RyqgQDS2Z0VSd9OKDpnmB YAAPv1Wh1qP9tv9a0DqPEEXrBafTx2ZQZ7LfcqEuWmp/d2Q+sq/gz5ae2W6CkuPjJW3I OWMcmEF2aHKyhXWdN8+KsOt3m/rbhBdDXoHmjR0kzEyO/sBE7DPMbK0x5vbjgZuLTN7d +a5CqWB4zeEHVoYA3H69emfHvKRfpQRSkZzFNoruwObBE67/qQPC6AD4eEo5iwHYflev IjmjjpEy91EdpcBkOAcMjTX6GCG6eEHY2PgTPgQpAptcRP9DKeFJprwi5IzJvWrBMSC/ OHzg== X-Gm-Message-State: AOJu0YxxhsjbcwzodM0W+Weok0zXWfEx2nh+Cb0CdACMlN79PYGIchRB TTPWpECGKY4hp2x0NqRV8cisvFjGEq4= X-Google-Smtp-Source: AGHT+IGABLQL+DZ7aIvKbjBZdnaUV7PI4zqrN7/Q7OSeqpE8yUpbJSecmmXrOpGMR50Tev8KITRz3w== X-Received: by 2002:a05:600c:444a:b0:407:8e85:899f with SMTP id v10-20020a05600c444a00b004078e85899fmr5853181wmn.16.1699887952845; Mon, 13 Nov 2023 07:05:52 -0800 (PST) Received: from localhost (bl21-184-115.dsl.telepac.pt. [2.82.184.115]) by smtp.gmail.com with UTF8SMTPSA id n7-20020a7bcbc7000000b004064cd71aa8sm8287916wmi.34.2023.11.13.07.05.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Nov 2023 07:05:52 -0800 (PST) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [FYI/pushed v4 19/25] gdbserver: Queue no-resumed event after thread exit Date: Mon, 13 Nov 2023 15:04:21 +0000 Message-Id: <20231113150427.477431-20-pedro@palves.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113150427.477431-1-pedro@palves.net> References: <20231113150427.477431-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.7 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Normally, if the last 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) Reviewed-By: Andrew Burgess Change-Id: I927d78b30f88236dbd5634b051a716f72420e7c7 --- 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 b4a1191b5b4..44d0fe38030 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -2972,7 +2972,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 ()); @@ -2986,23 +2985,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); @@ -3013,7 +2996,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); @@ -6177,6 +6160,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 3597e33289c..d46ea5aa3ec 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 4a312da40bc..a8e23561dcb 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -4731,7 +4731,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 dbb4e2d9024..81edff41268 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -614,6 +614,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 0f1fd5906fb..28d134e7915 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -319,6 +319,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); -- 2.34.1