From patchwork Fri Dec 1 15:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 81125 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 822103861844 for ; Fri, 1 Dec 2023 15:41:35 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id EB825385E004 for ; Fri, 1 Dec 2023 15:41:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB825385E004 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 EB825385E004 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701445264; cv=none; b=oOuMI6zGg28RkQIsCRO6ICnOWx/Zz/Sc0Qx9Y9r7oSFctlBAiJBOMO3wwV9/enuHf6m7DE2phJI8XWeFQFbuoynlPGLo7ZXyXC7e8cWhTtIl7Nvbz3uPg4BkWPb52x9l2MM4nJAKgmE/hSRNspLRFmYwNn2CsH7A0lEvVsiV1Y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701445264; c=relaxed/simple; bh=DZE83WupOVHeNfNXTshoKEFQtuccJkw/tCqHhVVoQqU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=A+hZNdK7pU8wXhsU6kU/DiDByYhu9sPQTHiENe0CQZKiEMrwMlSBvJuagxx1Io9PAc+KmqbqIrBsH7H3yKAMUwsHRFDyWIkCdZvzY+0P/QboRpI9IvAHtdv9iK9Gfn1j0iwNY2tPZjjRgYpVEesBD1mhRJFy3W609YTsVwXmZHo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-7b34ec3e44fso65621839f.3 for ; Fri, 01 Dec 2023 07:41:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1701445261; x=1702050061; darn=sourceware.org; h=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=uoBckuW4XBZE9Y2w8S/O7r3WHv1x/M86rcm35qcwzl8=; b=Oedt7kYL8ZN1XP5DJUAqcZU2PuXdhepBse1qj2PPZbJBTTMFGoj27eo+ER5R0gLASl x3ejxdyKC/OIwuwytBsU3M6vyiTklEENDzJ3BXXjRVNKtgRkTfalt5Qg01TZcia9XkUT odcezqf5WrOEd/HGQDeMsk9eciSi7s8wbPgZtkOQuTIQ/npBatbu9xoJvW0fzwE5XNVo dRupe3zZBdlhA7uuIsJ6uXhvldkYV+Rx1Pc2kqQk9QLt9gM4QqDtu0DsSjZospAzpfSK p1u73TY1D4zEJu4uAecN6YThhquSkdbg/UqlHWiQc1uO1f0Jx6QPn1ZMqy7AoQ9n4kuW Nehw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701445261; x=1702050061; h=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=uoBckuW4XBZE9Y2w8S/O7r3WHv1x/M86rcm35qcwzl8=; b=ucqw+RziDaim58FqcXkXTAiJIWr+PZy2D3bwf02CXC/cI7/J02aIxcKOPw+7m+v0J7 tODExBstO0r6+lewLy6/YfGLmNc7GIWFl3KuPlD6eM2Wqsq5uUnpj9oTgkwGmqBOccLE T2wcJ+A7B0HHmzb41HKYFZGfK6fFGt0svKjtdPl00mD11HGE28xD2WMh7MG2wPzoi+Tl 53elZWc1hdfdxrzd4A+HiHBFfuZ+vx2Wr5WSpwzuGz9XYj0Oz4iUTJM0ZWw2aH5dTG6w FYPB19CxJi1L7RjI80jU3RqNXfDyE3elpS4mVERB8KfebbMlGtW1ufG0kOYbJCfEZ84O mxiw== X-Gm-Message-State: AOJu0YzfnuLIOA+uZtB4gK2BbTM5OMdVnwaFw47nqMU8WQLLP8uQm7Y9 acdFoAgUizdJvyMZghO6A3iL+C0tlwU/sp0vqsQ= X-Google-Smtp-Source: AGHT+IE0wIDnkEK7qMs6MikpzC6OxTn7iCzSaQBs5JZg/SnFS23j1ou5T9zMSwPwBva2P7UN4hEicQ== X-Received: by 2002:a6b:7506:0:b0:7b3:f55c:49a7 with SMTP id l6-20020a6b7506000000b007b3f55c49a7mr7653679ioh.3.1701445260986; Fri, 01 Dec 2023 07:41:00 -0800 (PST) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id f4-20020a02cac4000000b0046662226e54sm906829jap.168.2023.12.01.07.41.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 07:41:00 -0800 (PST) From: Tom Tromey Date: Fri, 01 Dec 2023 08:40:58 -0700 Subject: [PATCH 2/6] Move DAP JSON reader to its own thread MIME-Version: 1.0 Message-Id: <20231201-dap-cancel-v1-2-872022fc328a@adacore.com> References: <20231201-dap-cancel-v1-0-872022fc328a@adacore.com> In-Reply-To: <20231201-dap-cancel-v1-0-872022fc328a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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.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. --- 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