From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id C27A63856261 for ; Wed, 31 May 2023 13:59:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C27A63856261 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f3b5881734so6846045e87.0 for ; Wed, 31 May 2023 06:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685541597; x=1688133597; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x3cE6CPf0BEytIiVVWNkSS9UMvR1E2+O2BO8HM6FZbw=; b=BXvKUQYJGUlHMpjwptchX48TZiN+5S7fxM7vPqVLveE9erq/FP3CoiZ1bMffD6niRL 1MydTnk1lnSZ+c336+mr2Sj4TLRjrD2ncx5vMHqramXaUxIT56l3CKL4KV5EaU5tJco8 ge1lhkD/5Jb0SzMXYWkRzt4NBPkI+atywrLixR2/pKteqvpFkeUv4oqUmKEvmX3zpFtU 2IqPOfPCh42kTrne9LZSqGPgdVdVod5sZ5rwgajWMgBtejk3uvHpzkWUs3yXx2Y21H3H HONL0tuvjYnKlXzs5ybgkFUJd2wOqGqj2mG9JO6QnRXsRfV+Hloqa8I8c3OXIwu83haF Xwxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685541597; x=1688133597; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x3cE6CPf0BEytIiVVWNkSS9UMvR1E2+O2BO8HM6FZbw=; b=LNc2n0nEhd5V5iHGppi9sy1+F2dkOgZba9bKZ5hUQ/bv8+1DjRaVVJ8B6rEClfLPR3 x9WAwKX41AlUK+f7NH/lFyuoqQOVPnRz0JmOksDt/Z3DWBTnGir5nvieacxuqdEBjTJZ PTlqInBV3HLelqX4bJF5HaP+KNAr6AiGfPD+e51DVrJ5oFd+QhfOcCUbwOCUg43LPMMq RRu4pTQw+NAJdsULVbP2gJC1mEbxb2fX+sJBz0QI0ZexVTGZPW8RaMyt4rObBOwU71Ja FZzYrpLrqbRmF8B51hDHHPAaVw1y9dugMg3QUqAF+5U7nzTU9JXmGUsfPHxRl2OrPYK2 2l6w== X-Gm-Message-State: AC+VfDy7+DSbxMWaz5H5lgjC7Muy5Dv1B0VF7LbVymYLgiVD6GF2gtia m3rzClzeMlaNzDdMNGQPvamNUZxTOpQdxQ== X-Google-Smtp-Source: ACHHUZ4KawQzKhmGppjZlg5f6QsolJSHN5/zGeUUQbSLMfs31ksf3d4w3Jy2sEl/DP34WO4raokb2Q== X-Received: by 2002:ac2:4829:0:b0:4f3:8f3a:f98d with SMTP id 9-20020ac24829000000b004f38f3af98dmr2675663lft.45.1685541596589; Wed, 31 May 2023 06:59:56 -0700 (PDT) Received: from fedora.. (78-73-77-63-no2450.tbcn.telia.com. [78.73.77.63]) by smtp.gmail.com with ESMTPSA id u4-20020ac248a4000000b004f3b5af3971sm732602lfg.104.2023.05.31.06.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 06:59:55 -0700 (PDT) From: Simon Farre To: gdb-patches@sourceware.org Cc: Simon Farre Subject: [PATCH v1] Fix DAP Stop & Continue event bugs Date: Wed, 31 May 2023 15:59:52 +0200 Message-Id: <20230531135952.207022-1-simon.farre.cx@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,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 List-Id: Fixes a bug in the stop and continue event handlers in the DAP code. Event handlers used the `gdb.selected_thread` which may or may not be null at the time the event handler is called. It may also return the wrong thread. The event parameter holds the necessary data. --- gdb/python/lib/gdb/dap/events.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/python/lib/gdb/dap/events.py b/gdb/python/lib/gdb/dap/events.py index d9ae603dfa4..bd46c233e1c 100644 --- a/gdb/python/lib/gdb/dap/events.py +++ b/gdb/python/lib/gdb/dap/events.py @@ -82,7 +82,7 @@ _suppress_cont = False @in_gdb_thread -def _cont(event): +def _cont(event: gdb.events.ContinueEvent): global _suppress_cont if _suppress_cont: log("_suppress_cont case") @@ -91,7 +91,7 @@ def _cont(event): send_event( "continued", { - "threadId": gdb.selected_thread().global_num, + "threadId": event.inferior_thread.global_num, "allThreadsContinued": True, }, ) @@ -135,11 +135,11 @@ class ExecutionInvoker(Invoker): @in_gdb_thread -def _on_stop(event): +def _on_stop(event: gdb.events.StopEvent): log("entering _on_stop: " + repr(event)) global _expected_stop obj = { - "threadId": gdb.selected_thread().global_num, + "threadId": event.inferior_thread.global_num, "allThreadsStopped": True, } if isinstance(event, gdb.BreakpointEvent): -- 2.40.1