From patchwork Wed May 31 13:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Farre X-Patchwork-Id: 70386 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 6C2AE3858C30 for ; Wed, 31 May 2023 14:00:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C2AE3858C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685541621; bh=x3cE6CPf0BEytIiVVWNkSS9UMvR1E2+O2BO8HM6FZbw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=f6a36TktWXNhHYkOPjfuFwcqADEOGonAjwW0iop7cVei2v+nv0mJkkWe0OP7NSi54 fXqhssiT871fNglrA4bC2zoEM/4cXvN5aeyfUEmWLFOOOm3nkBc6VBNlJVfxhDs1PN CnUV2XVAXGNFhaGZfoI/XSk0lJwmSU7dby9H7teQ= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f3b5881734so6846045e87.0 for ; Wed, 31 May 2023 06:59:58 -0700 (PDT) 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) 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 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Farre via Gdb-patches From: Simon Farre Reply-To: Simon Farre Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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):