From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 339A6385841C for ; Wed, 21 Feb 2024 13:20:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 339A6385841C 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 339A6385841C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521631; cv=none; b=RsB1L89jYoJBMuV2B9QxQeMwAjb0aW5nk1vlNa9qbh37QYqrurgGW+t29fzlKqnJTKxEvETdvASQXA6LgUV+dSuDSnJqew+Fudrk6DmkDfg6ppqRIofJs3cJlgPkeIIZgaOuuUlrsiuPWEnYltyrqhCpAh6IhBsn10VKRQL5JtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708521631; c=relaxed/simple; bh=uztUlvo181G29aAjEeNvM1F5TvaY4Ossf0k7c3fn4rg=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=tZqHoGnOGtMb93tzqG4VnhN2MHWthyXUU3UoaZ5uHKZdCW9kGzaAnFOM5+SSgixAaNEzCPgdGqXeOpyeiND/rkIgJ0WEO8o/pdN1+l3cypfGjQgQRBQhVGsf0IHe0o/Oba33BcoXanR1CaDJiz1FZgMhiWps7OlsgZrda3YLcPM= 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-out1.suse.de (Postfix) with ESMTPS id 3B32321E57 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=9DVkSYjdBnbJUlQgZYY0OtQ6ZMxKaB49GfXAl054NaY=; b=1bRAhUAXm0DT1xdufLnLG/cwdY8yCNW+DThAhERBzHOmAyCNF5L2S5MVScNi/GgvLs+CVs oaYBgX+V66VogtDvQ1x1cRxfMdv9tWBgQX3s/DWz3wf8961dXZiv+7lIGAQHETwO4dRbT5 nXcInUrYJuUH7IS5d7kSL20t87RoZrw= 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=9DVkSYjdBnbJUlQgZYY0OtQ6ZMxKaB49GfXAl054NaY=; b=EamoDBGXI/SMvtOjg5TRonmuzFKjIqm6MhEBcpAtH1T10BDSyYbtfMX0stu9sa+elfwbmH QgawyygjEWs8C3Bg== 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=9DVkSYjdBnbJUlQgZYY0OtQ6ZMxKaB49GfXAl054NaY=; b=1bRAhUAXm0DT1xdufLnLG/cwdY8yCNW+DThAhERBzHOmAyCNF5L2S5MVScNi/GgvLs+CVs oaYBgX+V66VogtDvQ1x1cRxfMdv9tWBgQX3s/DWz3wf8961dXZiv+7lIGAQHETwO4dRbT5 nXcInUrYJuUH7IS5d7kSL20t87RoZrw= 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=9DVkSYjdBnbJUlQgZYY0OtQ6ZMxKaB49GfXAl054NaY=; b=EamoDBGXI/SMvtOjg5TRonmuzFKjIqm6MhEBcpAtH1T10BDSyYbtfMX0stu9sa+elfwbmH QgawyygjEWs8C3Bg== 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 2150C13A99 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 CNDBBpz41WW9cQAAD6G6ig (envelope-from ) for ; Wed, 21 Feb 2024 13:20:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/3] [gdb/dap] Fix race between dap startup and dap log file Date: Wed, 21 Feb 2024 14:20:22 +0100 Message-Id: <20240221132023.15147-2-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-out1.suse.de; none X-Spamd-Result: default: False [1.90 / 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]; 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]; 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(-3.00)[100.00%] X-Spam-Score: 1.90 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: In dap_gdb_start we do: ... append GDBFLAGS " -iex \"set debug dap-log-file $logfile\" -q -i=dap" ... While the dap log file setting comes before the dap interpreter setting, the order is the other way around: - first, the dap interpreter is started - second, the -iex commands are executed and the log file is initialized. Consequently, there's a race between dap interpreter startup and dap log file initialization. This cannot be fixed by using -eiex instead. Before the interpreter is started, the "set debug dap-log-file" command is not yet registered. Fix this by postponing the start of the DAP server until GDB has processed all command files. Tested on aarch64-linux. PR dap/31386 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31386 --- gdb/python/lib/gdb/dap/__init__.py | 20 +++++++++++++++++++- gdb/python/py-dap.c | 23 ++++++++++++++++++++--- gdb/testsuite/gdb.dap/eof.exp | 3 +++ gdb/testsuite/lib/dap-support.exp | 10 ++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py index f60b3fda1db..86da9b8ef3c 100644 --- a/gdb/python/lib/gdb/dap/__init__.py +++ b/gdb/python/lib/gdb/dap/__init__.py @@ -69,5 +69,23 @@ def run(): os.close(wfd) # Note the inferior output is opened in text mode. + global server server = Server(open(saved_in, "rb"), open(saved_out, "wb"), open(rfd, "r")) - startup.start_dap(server.main_loop) + + +# Whether the interactive session has started. +session_started = False + + +def pre_command_loop(): + """DAP's pre_command_loop interpreter hook. This is called by the GDB DAP + interpreter.""" + global session_started + if not session_started: + # The pre_command_loop interpreter hook can be called several times. + # The first time it's called, it means we're starting an interactive + # session. + session_started = True + startup.thread_log("starting DAP server") + global server + startup.start_dap(server.main_loop) diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c index 5757c150165..2034105c939 100644 --- a/gdb/python/py-dap.c +++ b/gdb/python/py-dap.c @@ -61,13 +61,18 @@ class dap_interp final : public interp return m_ui_out.get (); } + void pre_command_loop () override; + private: std::unique_ptr m_ui_out; }; -void -dap_interp::init (bool top_level) + +/* Call function FN_NAME from module gdb.dap. */ + +static void +call_dap_fn (const char *fn_name) { gdbpy_enter enter_py; @@ -75,18 +80,30 @@ dap_interp::init (bool top_level) if (dap_module == nullptr) gdbpy_handle_exception (); - gdbpy_ref<> func (PyObject_GetAttrString (dap_module.get (), "run")); + gdbpy_ref<> func (PyObject_GetAttrString (dap_module.get (), fn_name)); if (func == nullptr) gdbpy_handle_exception (); gdbpy_ref<> result_obj (PyObject_CallObject (func.get (), nullptr)); if (result_obj == nullptr) gdbpy_handle_exception (); +} + +void +dap_interp::init (bool top_level) +{ + call_dap_fn ("run"); current_ui->input_fd = -1; current_ui->m_input_interactive_p = false; } +void +dap_interp::pre_command_loop () +{ + call_dap_fn ("pre_command_loop"); +} + void _initialize_py_interp (); void _initialize_py_interp () diff --git a/gdb/testsuite/gdb.dap/eof.exp b/gdb/testsuite/gdb.dap/eof.exp index 9c17725c0d0..a84b1d21e04 100644 --- a/gdb/testsuite/gdb.dap/eof.exp +++ b/gdb/testsuite/gdb.dap/eof.exp @@ -35,3 +35,6 @@ catch "wait -i $gdb_spawn_id" unset gdb_spawn_id dap_check_log_file + +# Check that first log message is present. +dap_check_log_file_re [string_to_regexp "starting DAP server"] diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 31f036eddf2..5818d815df3 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -366,6 +366,16 @@ proc dap_check_log_file {} { } } +# Read the most recent DAP log file and check that regexp RE matches. +proc dap_check_log_file_re { re } { + set fd [open [current_dap_log_file]] + set contents [read $fd] + close $fd + + set ok [regexp $re $contents] + gdb_assert {$ok} "log file matched $re" +} + # Cleanly shut down gdb. TERMINATE is passed as the terminateDebuggee # parameter to the request. proc dap_shutdown {{terminate false}} { -- 2.35.3