From patchwork Fri Feb 23 21:11:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 86312 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 3E4CD3858437 for ; Fri, 23 Feb 2024 21:13:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 0530D385841B for ; Fri, 23 Feb 2024 21:11:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0530D385841B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0530D385841B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708722704; cv=none; b=ny86vGQ9pekUtmnuH01q7dzYgjhk0eYejXJNJkika2b/UOFCc0bbSRL7Ti+s8POWO+0hfG9Mfmbi+hdsQ0xbGKjxy/PfH/AKEfo+Gz9HeeQpMMrdbz8aTpIlOnqEdT8kqrc0xPZrqWg9CVMCyCxXbtliWKaA7CNiYoYe1z/5WOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708722704; c=relaxed/simple; bh=3pXo7a3s3t1F3e8PTJNam5gZTEX+3h2XAq97ZPAgLLc=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=csyPWAdONfSIOunBKo6h747uAM0T5yyJBAULvF1GxhbxN4nzgrdsOB1PBRZHQILI6rgN2xpP/4S4uNLLesw71T9EP3Tk66ZWe0qfHLcLnyNWi7O7hw3nVu9ptauYj8aCDkN52K2eWcCMyiGFxK33WuAh0QM7mOUFdTyOlBhroPI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7c48fc56752so23583039f.3 for ; Fri, 23 Feb 2024 13:11:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1708722701; x=1709327501; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1W4G2MWgiXRoq5RPOdC2TQ38QHHTV38qoUvCpH8Nj/k=; b=aik2FlxAxC9cWygTiHCgnkNqeTEsXizU5j3rxxFKn+Z/RLuJ7kvyQGxyNQJoIuF10c fwLpkKRT88FNbiH7oIE5jbaAEN0pidrtfPZuPcPunL9KADc7qh/7xgcvdBLcHCOAA1LZ IezQd6O/hk98gJSyAoQ6G6fxEduZZ5DE2xi19urDV8hMKVbc5OI67CtaVqmUanKm8DnL JBGC+kHsqpiSvnO86i3VFtOPYvI5fCb6kYQQ5HcDEyxwcy7v2qcbIUeavlZjqTM/ZKVx zicElj4jPlsWdX9GI71xPU5ISUzoWH6hW/0vBQ1UTmICjV9Cf8R3lgBB2FTzsvdcyIlV HtPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708722701; x=1709327501; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1W4G2MWgiXRoq5RPOdC2TQ38QHHTV38qoUvCpH8Nj/k=; b=R9iJxgxKtHePSRNERxdTg9CGZBXg/eXsffLAP5WjYz95uyynTsiAYEX7y/8AmwwxdT Z3kEkFgcJ3+kb4PDdUSt/jKbkRxlFxxRjZym0d7jySwP62vOeOGSN7oC57sqTGU4zJbj E9jnsJbsL6UkSGvw8Tq9gGDvLScY3YBWxnR1ZCV62qkfi6d+f0SIXYrKshisi/UovfMA 9pJ7zvgnc4IIW6Sx5xDr3WSdO6Ae6TdpIHOTSetPdj4OOVcal1AdSmpz+/bvLVThkxP1 kv9nhhpT6U5YJOQiwguMldQI38JshBRRWEjo0rmIt1C8h+mYYUXk7Hj7W2UevKcw+T01 8nfA== X-Gm-Message-State: AOJu0YxQh42eehg8TjnrARoPVLlU5x1LIJQ+3Z+VeTI5t4oZ7jCy4i18 pZ0CU78cXzpbJIsIetrROxWIXw9lYXrLA5WnHbbExMVLcOJlhlj/lNocmmDzBAvuqRnNPN87PPI = X-Google-Smtp-Source: AGHT+IFMlvCP2x5ZKw5bTc/aO77ARNC2SS7zPAX70qgop5tKQqlyGGFdYZULCpqN00mw0pdE0whA0A== X-Received: by 2002:a92:d8ca:0:b0:365:2f3f:846 with SMTP id l10-20020a92d8ca000000b003652f3f0846mr1108814ilo.23.1708722701189; Fri, 23 Feb 2024 13:11:41 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id y14-20020a02c00e000000b004741aec6cdasm3497851jai.25.2024.02.23.13.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 13:11:40 -0800 (PST) From: Tom Tromey Date: Fri, 23 Feb 2024 14:11:41 -0700 Subject: [PATCH 5/5] Explicitly quit gdb from DAP server thread MIME-Version: 1.0 Message-Id: <20240223-final-cleanups-v1-5-84d5271e9979@adacore.com> References: <20240223-final-cleanups-v1-0-84d5271e9979@adacore.com> In-Reply-To: <20240223-final-cleanups-v1-0-84d5271e9979@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 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 This changes the DAP code to explicitly request that gdb exit. Previously this could cause crashes, but with the previous cleanups, this should no longer happen. This also adds a tests that ensures that gdb exits with status 0. --- gdb/python/lib/gdb/dap/server.py | 1 + gdb/testsuite/lib/dap-support.exp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/gdb/python/lib/gdb/dap/server.py b/gdb/python/lib/gdb/dap/server.py index 6757f2921bf..19840f4028d 100644 --- a/gdb/python/lib/gdb/dap/server.py +++ b/gdb/python/lib/gdb/dap/server.py @@ -230,6 +230,7 @@ class Server: # responses are flushed to the client before exiting. self.write_queue.put(None) json_writer.join() + send_gdb("quit") @in_dap_thread def send_event_later(self, event, body=None): diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 72c22d00711..54795a34e39 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -400,6 +400,15 @@ proc dap_check_log_file_re { re } { proc dap_shutdown {{terminate false}} { dap_check_request_and_response "shutdown" disconnect \ [format {o terminateDebuggee [l %s]} $terminate] + + # Check gdb's exit status. + global gdb_spawn_id + set result [wait -i $gdb_spawn_id] + gdb_assert {[lindex $result 2] == 0} + gdb_assert {[lindex $result 3] == 0} + + clear_gdb_spawn_id + dap_check_log_file }