From patchwork Mon Dec 11 16:02:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 81914 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 CA362385C413 for ; Mon, 11 Dec 2023 16:02:41 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 5B5A83858C5F for ; Mon, 11 Dec 2023 16:02:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B5A83858C5F Authentication-Results: sourceware.org; dmarc=pass (p=none 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 5B5A83858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702310543; cv=none; b=kG+DHeUm0VSA199VJWa0tiZ1iLNfxdpbkHN2ugh99AceMNj2fSazyt4AsDUDIRUPCHkvHVxOsUxxnJkPifx3BAxK/zey08xKnf1hUjDYIIV7+Y8k7cqcseS0SBETJaQPB2WaPvGKX4GKez8q3+j56Yww9+s+AoKWkPV1Giwqs+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702310543; c=relaxed/simple; bh=xFLP2jGXBarBBL6UzOuh2b1S9DzVNKWFQCuB7zCiaNA=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=YctvKF6xLmR4tr9cSRiePEzDZUlliVxupmW3J75Ki/l2hziQRJvk/71YOeRhGmcPvfuJhiEZepC7EGlnyreCqMrUM8u3PRGPHIx6XC+xEObfkQIdhCWX3SCCqpocwNLiClJt7RNECKbudgu4BkrwEcjrGDgj4JZohvnn+c55WCI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-35d67aa6951so14306775ab.0 for ; Mon, 11 Dec 2023 08:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1702310541; x=1702915341; darn=sourceware.org; h=cc: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=+axXYG10NsDM5RLP71UUKsOb3qlEBpMS2aTh7PNsGcY=; b=eiHIGFSGSs/VD3fZLP2xkB2lB4FXyRj16Q5G412ZrEC5kBASxsGlpPCNj960yDrWnB P6OYZc2sQs8hj5VK1vNwyV993BJZnZrOB62o/QIPPQp8KaT/V1dDtrbQ8EFlcOnb/n7o g+dvfcG7UgVeD2tzn5nIy5NPeXaNaHwHMy/trjnSfmcbtH9v3QoFD4ltOrySEiNQ3jyJ 0txe3WT+flTyfmOtUIibc6kxpTIjv3frn81gvOaJmSWRqup1zAXJmN6HHKhMOElwn/Mm t2cMP/BULM4XW92OczvzCIU+RwTE0kF5ZY9tqnUJ+ZjM8sw8BWX5QKLYEtZjK33+d27j moqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702310541; x=1702915341; h=cc: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=+axXYG10NsDM5RLP71UUKsOb3qlEBpMS2aTh7PNsGcY=; b=JDAuenCH5E8gT8Fg++cecOL3hzPavOo5WzavATTMex5MLXOp7twxk71LT/JhVoAnCI C/Axt/EvfQgrgEuv5r+J0NnPfxvIbXb+4Daxp0THGHfBOLVrXiHpfI3FDNhs9BSFseyU g6wkf6WhRhxK+tvzoeggskK8oU4e92LIriJrOjC7q2flLfhfuDmpKOpUHv0YaJnJ1Flx V2xJvODmHCvXUeoj0wV0j0eYRW7c1OB+WCc2WY9JzcFcFCnGczkSY/oGtHBJj6QY45B1 +8q9BelNESLzuHpNKfpEgpQufjCuNK9XeoXKwEf/d/3yJErHR6CbufmQwP40qSoOGSoZ 8MGQ== X-Gm-Message-State: AOJu0YxNfJbnvoY/c2LGMgsGr5eg3vwWMucbYr/i0I3dG/aCs/EQEOTz zaw1TIqzEdgfXzgdIwskuLc7jA== X-Google-Smtp-Source: AGHT+IEzV1/e5E578oTq56k8fCyrLlcPrDf2TX60xjZ43LlP78mDrh84VCqVDGp2HDSSNZ3HnZNnVg== X-Received: by 2002:a05:6e02:1a2a:b0:35d:726c:5d16 with SMTP id g10-20020a056e021a2a00b0035d726c5d16mr4363579ile.31.1702310541471; Mon, 11 Dec 2023 08:02:21 -0800 (PST) Received: from localhost.localdomain (71-211-161-25.hlrn.qwest.net. [71.211.161.25]) by smtp.gmail.com with ESMTPSA id h25-20020a02cd39000000b0042acf934cbasm1879113jaq.72.2023.12.11.08.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 08:02:21 -0800 (PST) From: Tom Tromey Date: Mon, 11 Dec 2023 09:02:19 -0700 Subject: [PATCH v2 2/6] Move DAP JSON reader to its own thread MIME-Version: 1.0 Message-Id: <20231211-dap-cancel-v2-2-db7b52cf0329@adacore.com> References: <20231211-dap-cancel-v2-0-db7b52cf0329@adacore.com> In-Reply-To: <20231211-dap-cancel-v2-0-db7b52cf0329@adacore.com> To: gdb-patches@sourceware.org Cc: =?utf-8?q?K=C3=A9vin_Le_Gouguec?= X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_XBL, 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 server to move the JSON reader to a new thread. This is key to implementing request cancellation, as now requests can be read while an earlier one is being serviced. Reviewed-By: Kévin Le Gouguec --- gdb/python/lib/gdb/dap/server.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/python/lib/gdb/dap/server.py b/gdb/python/lib/gdb/dap/server.py index d865dee31a8..53a0ca7f448 100644 --- a/gdb/python/lib/gdb/dap/server.py +++ b/gdb/python/lib/gdb/dap/server.py @@ -60,6 +60,9 @@ class Server: # DAP client. Writing is done in a separate thread to avoid # blocking the read loop. self.write_queue = DAPQueue() + # Reading is also done in a separate thread, and a queue of + # requests is kept. + self.read_queue = DAPQueue() self.done = False global _server _server = self @@ -111,6 +114,14 @@ class Server: log("WROTE: <<<" + json.dumps(obj) + ">>>") self.write_queue.put(obj) + # This is run in a separate thread and simply reads requests from + # the client and puts them into a queue. + def _reader_thread(self): + while True: + cmd = read_json(self.in_stream) + log("READ: <<<" + json.dumps(cmd) + ">>>") + self.read_queue.put(cmd) + @in_dap_thread def main_loop(self): """The main loop of the DAP server.""" @@ -118,9 +129,9 @@ class Server: # client, and the thread that reads output from the inferior. start_thread("output reader", self._read_inferior_output) start_json_writer(self.out_stream, self.write_queue) + start_thread("JSON reader", self._reader_thread) while not self.done: - cmd = read_json(self.in_stream) - log("READ: <<<" + json.dumps(cmd) + ">>>") + cmd = self.read_queue.get() result = self._handle_command(cmd) self._send_json(result) events = self.delayed_events