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 94DD138618BB for ; Mon, 19 Feb 2024 08:23:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94DD138618BB 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 94DD138618BB 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=1708331042; cv=none; b=heaVo6zN2Hv3DoHcP+o9spYWF+rcASkPOoRTdiAtmSb/NyaCJmbPQOW+uOG4KIzkiU7K/aYybZ2tLjgA263TocutjYb0f/7krjHEUoynkpZ9SJEehhwSGUm8uSrSLVqpaMR+rrxBAnvxZiHNMv9K7ydQmdoRdSfT0d0qUw6B3dE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708331042; c=relaxed/simple; bh=hQzKCrj9OXA8JgZ9jxc2VTISJ56e7Tjgbq/Yj6lScW4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=STrJOGvBplUvLyLP8/rdcIzM0cGAHCUONxHa84CnYcoVq53qMMTEBVNRY5k6e1q5OVVXkYSEVsfuEjaiXVbr8n2FEhcXidFmHBAhx7fe8+DiS89uqCBB0JaOMg/T+pFOxzSDWNgNsu1OlzwsfnKo24JVQh24xVoJaoXI65uyfTk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 AB78D1FD09 for ; Mon, 19 Feb 2024 08:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708331034; 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=mPPamV0qDwFI2ZkVcNHxUQ76MpdiEbT2f/XkE2rMTR0=; b=XBQUS64b0kgDrqQFU/n4Z0iwMlt2ApysC5gt65X9dN9ZSI81Lpn3/y5LJM+22KkJyenm7P MiMANRBmTxnVg3svP1FceCG34AAMl3o5/uMi5RBM0gakCJ2vtb18kRvpcv+5fpHRTcK/QC +SPeT239G1vI/ArCcWx6CfAgcdePhy8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708331034; 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=mPPamV0qDwFI2ZkVcNHxUQ76MpdiEbT2f/XkE2rMTR0=; b=03Rw21LrWH+AJP6cCbeYk+yLgXGQS8aum9DxinX8U2VZoNAOQrWGHWpFWnbYYHrhA/5qpf oLu6WEvHUsBvWeAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708331032; 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=mPPamV0qDwFI2ZkVcNHxUQ76MpdiEbT2f/XkE2rMTR0=; b=k3/DDUVCsj39nDFWSXnMdbG4kptHX8isjGkkndgWaae0PvJhQzl7MbF6/BGaLJnpcTI0GQ g30QDJaPF4glUMa7e2XVuQ/vJafwxT7oDigBLrcX9vEHVgVJAZ40QnGx8q+3ULC/qe4u0g 2hOkBW447p/sIVoztq5ZryOQbcv3rT4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708331032; 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=mPPamV0qDwFI2ZkVcNHxUQ76MpdiEbT2f/XkE2rMTR0=; b=H5eGYwxTFhfBFNhyPhaw7e103BxLh/HM7XazBzlDJnLnDWlmO9FK2Wga+If1IMGF+YjCfo wURjh+O5V4ROd9Cg== 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 94C4A13AAA for ; Mon, 19 Feb 2024 08:23:52 +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 AK4LIxgQ02WaBAAAD6G6ig (envelope-from ) for ; Mon, 19 Feb 2024 08:23:52 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 6/8] [gdb/dap] Don't let dap log string grow indefinitely Date: Mon, 19 Feb 2024 09:23:39 +0100 Message-Id: <20240219082341.21313-6-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240219082341.21313-1-tdevries@suse.de> References: <20240219082341.21313-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="k3/DDUVC"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=H5eGYwxT X-Spamd-Result: default: False [1.69 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url,suse.de:dkim]; 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-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 1.69 X-Rspamd-Queue-Id: AB78D1FD09 X-Spamd-Bar: + X-Spam-Status: No, score=-12.2 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: As mentioned in commit "[gdb/dap] Fix race between dap startup and dap log file", initially logging to a string has the drawback that the string can keep growing indefinitely if a log file is never set. Fix this by: - using the pre_command_loop interpreter hook to detect this situation, and - stopping the logging to string. Tested on aarch64-linux. PR dap/31386 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31386 --- gdb/python/lib/gdb/dap/__init__.py | 14 ++++++++++++++ gdb/python/lib/gdb/dap/startup.py | 5 +++++ gdb/python/py-dap.c | 21 +++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py index f60b3fda1db..92ea2afeaa5 100644 --- a/gdb/python/lib/gdb/dap/__init__.py +++ b/gdb/python/lib/gdb/dap/__init__.py @@ -71,3 +71,17 @@ def run(): # Note the inferior output is opened in text mode. 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(): + 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.dap_log.session_started() diff --git a/gdb/python/lib/gdb/dap/startup.py b/gdb/python/lib/gdb/dap/startup.py index 596012688ac..3b8df2fbf32 100644 --- a/gdb/python/lib/gdb/dap/startup.py +++ b/gdb/python/lib/gdb/dap/startup.py @@ -174,6 +174,11 @@ class LoggingParam(gdb.Parameter): self.log_file.flush() return "" + def session_started(self): + with dap_log.lock: + if isinstance(self.log_file, io.StringIO): + self.log_file = None + dap_log = LoggingParam() diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c index 5757c150165..2b889e3b573 100644 --- a/gdb/python/py-dap.c +++ b/gdb/python/py-dap.c @@ -61,6 +61,8 @@ class dap_interp final : public interp return m_ui_out.get (); } + void pre_command_loop () override; + private: std::unique_ptr m_ui_out; @@ -87,6 +89,25 @@ dap_interp::init (bool top_level) current_ui->m_input_interactive_p = false; } +void +dap_interp::pre_command_loop () +{ + gdbpy_enter enter_py; + + gdbpy_ref<> dap_module (PyImport_ImportModule ("gdb.dap")); + if (dap_module == nullptr) + gdbpy_handle_exception (); + + gdbpy_ref<> func (PyObject_GetAttrString (dap_module.get (), + "pre_command_loop")); + if (func == nullptr) + gdbpy_handle_exception (); + + gdbpy_ref<> result_obj (PyObject_CallObject (func.get (), nullptr)); + if (result_obj == nullptr) + gdbpy_handle_exception (); +} + void _initialize_py_interp (); void _initialize_py_interp () -- 2.35.3