From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 593DA385842D for ; Wed, 21 Feb 2024 13:20:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 593DA385842D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 593DA385842D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521631; cv=none; b=GeXIFn+MG2UEMUpPBNM+btgqK26IV/6Pru6q0hSMaqGAqU8ApiKH/PStEwBR3QAPV7JMcCU0GCznELsQ5wW9z/ItOYgQcWaPHEtk2DjOfXo8b8BmhkygDmzNBsFJdlHuanAT6mqTmu34g52d1lP1FtV74vFjC27aqrGrYYnd2Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521631; c=relaxed/simple; bh=EmkwvWoaDbvELHzSXA96SwqQzNxfwQUwPpA7jTYo3f0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=m8QqJ+4ZjcgjxEdin09SnH0/qi7WPypjEEWanc0wS8Or0Bk9o1xuE8GAihF51YYNshEcq/jTahDs73vf07PI0KIJvvh71jMEOiYjJV9K+jTpzSwaZ+SxfSjDVMGjsE9i2D5RBYSZiEy9Tx7VRRg7tNN1I9nc1Vq5EwpclEBX+74= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 53E0B1FB5A for ; Wed, 21 Feb 2024 13:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708521628; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iSqZK5lnA/2YEITZIG/SmZtjYZgpXFRiK00vglYtkKs=; b=da8bVoY0jNpdFvOpVzGrpV9NMQGrvEHpV/I3OHtaAprXF0ihDJu2ll710Fx4E0KwRe8Tf2 hFLbc36WN4b2HJJyT+k9Egm+hT3cwGFrj4kgJnrGCJrm6sCgkSWHRVjNIFgJx7rb7/Qcut rttIRUteX4WPvE/GTxN7dLDvLXq/keY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708521628; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iSqZK5lnA/2YEITZIG/SmZtjYZgpXFRiK00vglYtkKs=; b=p8D71lrG4swLRu3tm0ncPpGLeGY5Q+6aTnM82ELhZ8MA4liA0ScRPWHjDvwwcCi4ECgS2H 8mtmV5Azo30+egCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708521628; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iSqZK5lnA/2YEITZIG/SmZtjYZgpXFRiK00vglYtkKs=; b=da8bVoY0jNpdFvOpVzGrpV9NMQGrvEHpV/I3OHtaAprXF0ihDJu2ll710Fx4E0KwRe8Tf2 hFLbc36WN4b2HJJyT+k9Egm+hT3cwGFrj4kgJnrGCJrm6sCgkSWHRVjNIFgJx7rb7/Qcut rttIRUteX4WPvE/GTxN7dLDvLXq/keY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708521628; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iSqZK5lnA/2YEITZIG/SmZtjYZgpXFRiK00vglYtkKs=; b=p8D71lrG4swLRu3tm0ncPpGLeGY5Q+6aTnM82ELhZ8MA4liA0ScRPWHjDvwwcCi4ECgS2H 8mtmV5Azo30+egCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3E04D139D0 for ; Wed, 21 Feb 2024 13:20:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QDvRDZz41WW9cQAAD6G6ig (envelope-from ) for ; Wed, 21 Feb 2024 13:20:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 3/3] [gdb/dap] Fix race between dap exit and gdb exit Date: Wed, 21 Feb 2024 14:20:23 +0100 Message-Id: <20240221132023.15147-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240221132023.15147-1-tdevries@suse.de> References: <20240221132023.15147-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 1.36 X-Spamd-Result: default: False [1.36 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-2.34)[96.95%] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: When DAP shuts down due to an EOF event, there's a race between: - gdb's main thread handling a SIGHUP, and - the DAP main thread exiting. Fix this by waiting for DAP's main thread exit during the gdb_exiting event. Tested on aarch64-linux. PR dap/31380 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31380 --- gdb/python/lib/gdb/dap/startup.py | 20 +++++++++++++++++++- gdb/testsuite/gdb.dap/eof.exp | 9 +++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/gdb/python/lib/gdb/dap/startup.py b/gdb/python/lib/gdb/dap/startup.py index 29fe78ecd53..38a2e295e07 100644 --- a/gdb/python/lib/gdb/dap/startup.py +++ b/gdb/python/lib/gdb/dap/startup.py @@ -93,7 +93,9 @@ def start_dap(target): _dap_thread = threading.current_thread() target() - start_thread("DAP", really_start_dap) + # Note that we set _dap_thread in both the DAP and the GDB main thread. + global _dap_thread + _dap_thread = start_thread("DAP", really_start_dap) def in_gdb_thread(func): @@ -208,6 +210,22 @@ def exec_and_log(cmd): log_stack() +@in_gdb_thread +def _on_gdb_exiting(event): + if _dap_thread is None: + # This can happen if the DAP module is imported, but the server not + # started. + thread_log("no dap thread to join") + return + + thread_log("joining dap thread ...") + _dap_thread.join() + thread_log("joining dap thread done") + + +gdb.events.gdb_exiting.connect(_on_gdb_exiting) + + class Invoker(object): """A simple class that can invoke a gdb command.""" diff --git a/gdb/testsuite/gdb.dap/eof.exp b/gdb/testsuite/gdb.dap/eof.exp index a84b1d21e04..05048f2762a 100644 --- a/gdb/testsuite/gdb.dap/eof.exp +++ b/gdb/testsuite/gdb.dap/eof.exp @@ -38,3 +38,12 @@ dap_check_log_file # Check that first log message is present. dap_check_log_file_re [string_to_regexp "starting DAP server"] + +# There should be one "READ:" for the initialize request, and at least one +# "WROTE:" for the initialize response. +dap_check_log_file_re "READ:" +dap_check_log_file_re "WROTE:" + +# Check that all thread termination messages are there. +dap_check_log_file_re "JSON writer: terminating" +dap_check_log_file_re "DAP: terminating" -- 2.35.3