From patchwork Fri Jul 28 17:09:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 73337 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 5B2373854C64 for ; Fri, 28 Jul 2023 17:10:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B2373854C64 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690564212; bh=6Iy//AYRtic4BVCDzJgOS5C7LUDenphcVEXI5U1k2XI=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=j26e8IOxQhcNyqRNK0EJRSqm6Garc8BSu3hXjDnyvuHi1fWajp0mgesB7UnXx2u/S 10URDYz3sUwpMc62z3E5y1Dhe6FsmJaVlBdTrfblTiiKx04Ly3CJdR6rupb97W2JEW D9lOa5CCE8XE+d9F2jF44gMb9/o4s7xYNAltxUoo= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id A51DA3858C50 for ; Fri, 28 Jul 2023 17:09:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A51DA3858C50 Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-77ac14ff51bso90500039f.3 for ; Fri, 28 Jul 2023 10:09:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690564158; x=1691168958; 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=6Iy//AYRtic4BVCDzJgOS5C7LUDenphcVEXI5U1k2XI=; b=K/Kmni/Rh3r1LVAoAhwx9zBTwmyhun4TPvuBXMw05y9bG41AOr/gPa69mWn1sh1G8f IYwGUteEc/WFPbr/L0A3tgp/0A7gDjX2khVHWObPk7fDTbh4MSuhx79C6nErM4RiC1r/ q9wAtOBhsu7Z9jFj99nJo06QDA26GRDwpIdx/rWP7ZlG+4Xg4/WzWbEDhdgptt63rwnj v34MpWeRVfLnhoyg1PFAnejWnjnBfB/aBNa9HhdCfPx9fmjTzbsXFuiF6157UPx1D9QK LxP4NPEDMeyX7giw7uaGbXlxbJMqfCR9F5pz6ZmzlTsSZhegci56qAfBAmhkUTYnGyRl 0ZiA== X-Gm-Message-State: ABy/qLY7ONMxFfUV3UjCrU8kcd8avrTs5gdjAbibxYmpy/q8a3R/0jNe lYO3zH4riLlD+X6iUUArnesJrTD54Zmd6ZuekaeyhQ== X-Google-Smtp-Source: APBJJlHwG/llUoMzvKvWGJkrOpmVI0rzRxS2svQbSEz5EJmkG3vUJkC/9HXtGFKSKJ2VVadug005GA== X-Received: by 2002:a6b:d617:0:b0:787:8fc:75d8 with SMTP id w23-20020a6bd617000000b0078708fc75d8mr190007ioa.9.1690564158407; Fri, 28 Jul 2023 10:09:18 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id k17-20020a5e8911000000b0077e3566a801sm1279269ioj.29.2023.07.28.10.09.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 10:09:18 -0700 (PDT) Date: Fri, 28 Jul 2023 11:09:15 -0600 Subject: [PATCH 1/3] Introduce sourceReference handling in DAP MIME-Version: 1.0 Message-Id: <20230728-dap-source-refs-v1-1-1bcc5cdffd44@adacore.com> References: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> In-Reply-To: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes the gdb DAP implementation to emit a real sourceReference, rather than emitting 0. Sources are tracked in some maps in sources.py, and a new helper function is introduced to compute the "Source" object that can be sent to the client. --- gdb/python/lib/gdb/dap/breakpoint.py | 10 +++------ gdb/python/lib/gdb/dap/bt.py | 9 ++------ gdb/python/lib/gdb/dap/sources.py | 42 ++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index 27745ebfd2c..9c214b2bf14 100644 --- a/gdb/python/lib/gdb/dap/breakpoint.py +++ b/gdb/python/lib/gdb/dap/breakpoint.py @@ -21,6 +21,7 @@ import re from typing import Optional, Sequence from .server import request, capability, send_event +from .sources import make_source from .startup import send_gdb_with_response, in_gdb_thread, log_stack from .typecheck import type_check @@ -48,15 +49,10 @@ def breakpoint_descriptor(bp): # multiple locations. See # https://github.com/microsoft/debug-adapter-protocol/issues/13 loc = bp.locations[0] - (basename, line) = loc.source + (filename, line) = loc.source result.update( { - "source": { - "name": os.path.basename(basename), - # We probably don't need this but it doesn't hurt to - # be explicit. - "sourceReference": 0, - }, + "source": make_source(filename, os.path.basename(filename)), "line": line, "instructionReference": hex(loc.address), } diff --git a/gdb/python/lib/gdb/dap/bt.py b/gdb/python/lib/gdb/dap/bt.py index 975c88f8208..34d05cbaac0 100644 --- a/gdb/python/lib/gdb/dap/bt.py +++ b/gdb/python/lib/gdb/dap/bt.py @@ -20,6 +20,7 @@ from gdb.frames import frame_iterator from .frames import frame_id from .modules import module_id from .server import request, capability +from .sources import make_source from .startup import send_gdb_with_response, in_gdb_thread from .state import set_thread @@ -59,13 +60,7 @@ def _backtrace(thread_id, levels, startFrame): newframe["line"] = line filename = current_frame.filename() if filename is not None: - newframe["source"] = { - "name": os.path.basename(filename), - "path": filename, - # We probably don't need this but it doesn't hurt - # to be explicit. - "sourceReference": 0, - } + newframe["source"] = make_source(filename, os.path.basename(filename)) frames.append(newframe) # Note that we do not calculate totalFrames here. Its absence # tells the client that it may simply ask for frames until a diff --git a/gdb/python/lib/gdb/dap/sources.py b/gdb/python/lib/gdb/dap/sources.py index af7313ca2f9..50b5909ed1d 100644 --- a/gdb/python/lib/gdb/dap/sources.py +++ b/gdb/python/lib/gdb/dap/sources.py @@ -19,16 +19,46 @@ from .server import request, capability from .startup import send_gdb_with_response, in_gdb_thread +# The next available source reference ID. Must be greater than 0. +_next_source = 1 + +# Map from full paths to Source dictionaries. +_source_map = {} + +# Map from a source reference ID back to the same Source that is +# stored in _source_map. +_id_map = {} + + +@in_gdb_thread +def make_source(fullname, filename): + """Return the Source for a given file name. + + FULLNAME is the full name. This is used as the key. + FILENAME is the base name. + """ + global _source_map + if fullname in _source_map: + result = _source_map[fullname] + else: + global _next_source + result = { + "name": filename, + "path": fullname, + "sourceReference": _next_source, + } + _source_map[fullname] = result + global _id_map + _id_map[_next_source] = result + _next_source += 1 + return result + + @in_gdb_thread def _sources(): result = [] for elt in gdb.execute_mi("-file-list-exec-source-files")["files"]: - result.append( - { - "name": elt["file"], - "path": elt["fullname"], - } - ) + result.append(make_source(elt["fullname"], elt["file"])) return { "sources": result, } From patchwork Fri Jul 28 17:09:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 73335 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 315BE3854822 for ; Fri, 28 Jul 2023 17:09:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 315BE3854822 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690564183; bh=Y42TuSPA4RszaEukXXKEv0/KamPotTHi2ZlqLQOSt4w=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NFll4i7m2DRwzDqoOujfU1rAXE56fVCQ0khDrSigXl30rEnuQhqXkMAovEqpW9Hbt xx+fdGlc5z7MqDPdhN2b9MjWbLcR2ewAQC+Bq3fU5o5efA0FqkMJaoR+/OaWw1tpW5 Xa+XHs97cdO7E2JJFrzDibRADSNux36QB1ynejdk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by sourceware.org (Postfix) with ESMTPS id E7DD73858C20 for ; Fri, 28 Jul 2023 17:09:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E7DD73858C20 Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-78362f57500so99344839f.3 for ; Fri, 28 Jul 2023 10:09:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690564159; x=1691168959; 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=Y42TuSPA4RszaEukXXKEv0/KamPotTHi2ZlqLQOSt4w=; b=WAxOy5vDyb5aSnOHvTMK4L51nakMobGzgoKFJVhhW92WfZlHr639AeR2zkbvjupKhr 35L1cVHvq9rR0tV55btizIb0VujyRxBYU35Tr1Yp1sn3Utr/m2IGAuGO2c01HSio/Ytm xBp1poTo3b5KMJsECJ6oJRpihi7XxWcunRU3sjWD7Kaw8+WrZSV2N99wmWQ5afYIeZrE H7W99cM1deFOEzNbaLk2j3IJ8KNfRaPekDg2cQMMCf+rBshXXbkVWLOtp6HTHnPjmwpk IFijtefMZoeCmDWr4NfuCAz47/yYRxXlXSwJsJj0pf9v6eBP/BS7rVf2eG7IKNhWaqal g5cQ== X-Gm-Message-State: ABy/qLZNTl2+Yk8daQ16VreqRurIxFk905/Zy2C/mEMgZVhBeWLgOGCr Hrg9+CFNwjPH6wLBK2vmV2u35gmKyJOmEMiWF2BGeA== X-Google-Smtp-Source: APBJJlHQ3/rbJubZcC5OaTnajiCfn01xaWlMvExtSV+fgzFjCxEFVGpWRd2bz+90eESHeTdptEq8tw== X-Received: by 2002:a5d:9146:0:b0:786:25cf:421f with SMTP id y6-20020a5d9146000000b0078625cf421fmr153466ioq.19.1690564159019; Fri, 28 Jul 2023 10:09:19 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id k17-20020a5e8911000000b0077e3566a801sm1279269ioj.29.2023.07.28.10.09.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 10:09:18 -0700 (PDT) Date: Fri, 28 Jul 2023 11:09:16 -0600 Subject: [PATCH 2/3] Handle Source in DAP breakpointLocations MIME-Version: 1.0 Message-Id: <20230728-dap-source-refs-v1-2-1bcc5cdffd44@adacore.com> References: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> In-Reply-To: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes the DAP breakpointLocations request to accept a Source and to decode it properly. --- gdb/python/lib/gdb/dap/locations.py | 12 ++++-------- gdb/python/lib/gdb/dap/sources.py | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gdb/python/lib/gdb/dap/locations.py b/gdb/python/lib/gdb/dap/locations.py index 594f1bad45b..a299e8da959 100644 --- a/gdb/python/lib/gdb/dap/locations.py +++ b/gdb/python/lib/gdb/dap/locations.py @@ -19,11 +19,13 @@ import gdb from typing import Optional from .server import capability, request +from .sources import decode_source from .startup import in_gdb_thread, send_gdb_with_response @in_gdb_thread -def _find_lines(filename, start_line, end_line): +def _find_lines(source, start_line, end_line): + filename = decode_source(source) lines = set() for entry in gdb.execute_mi("-symbol-list-lines", filename)["lines"]: line = entry["line"] @@ -44,10 +46,4 @@ def _find_lines(filename, start_line, end_line): def breakpoint_locations(*, source, line: int, endLine: Optional[int] = None, **extra): if endLine is None: endLine = line - if "path" in source: - filename = source["path"] - elif "name" in source: - filename = source["name"] - else: - raise Exception("") - return send_gdb_with_response(lambda: _find_lines(filename, line, endLine)) + return send_gdb_with_response(lambda: _find_lines(source, line, endLine)) diff --git a/gdb/python/lib/gdb/dap/sources.py b/gdb/python/lib/gdb/dap/sources.py index 50b5909ed1d..806352836db 100644 --- a/gdb/python/lib/gdb/dap/sources.py +++ b/gdb/python/lib/gdb/dap/sources.py @@ -54,6 +54,22 @@ def make_source(fullname, filename): return result +@in_gdb_thread +def decode_source(source): + """Decode a Source object. + + Finds and returns the filename of a given Source object.""" + if "path" in source: + return source["path"] + if "sourceReference" not in source: + raise Exception("either 'path' or 'sourceReference' must appear in Source") + ref = source["sourceReference"] + global _id_map + if ref not in _id_map: + raise Exception("no sourceReference " + str(ref)) + return _id_map[ref]["path"] + + @in_gdb_thread def _sources(): result = [] From patchwork Fri Jul 28 17:09:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 73336 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 DDE99385B800 for ; Fri, 28 Jul 2023 17:10:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DDE99385B800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690564205; bh=AhROQ4urWCTVOYBJWmUPq3bWFXrFBcBAMoObU7VRGqc=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=cFO8WKHMU9eFXXSz1YjoEjXfFiHmrRDTdPXN7Mh7c+IBwAQjVjW9mLHqoEc3NEd8p oO05LP/mVfC1MIBLHBft3c5ezmKltv0vQXi9IKTiIDrGE7Qoohitu7RzvlYxvXpOU4 jgXvNoHDcVodY1zGkz/jgDBYEh6wiVnNCaT0j6JM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by sourceware.org (Postfix) with ESMTPS id 58E263858C27 for ; Fri, 28 Jul 2023 17:09:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 58E263858C27 Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-783549ef058so99017839f.2 for ; Fri, 28 Jul 2023 10:09:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690564159; x=1691168959; 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=AhROQ4urWCTVOYBJWmUPq3bWFXrFBcBAMoObU7VRGqc=; b=UBObVBd7H4qpYwRuy+EK+s5rl/CHYqDtw4Ogc/0q/6Rgw/xRZaKqHZRuXWHqtuK6la ib6pqbFr2Rfh6RuARof2pL5coB1Fhr7y9tD7y75CirrZfAWN+J4e+ulu3LiHiSkuWMf2 a7Odtuw5Ubw4a9B1znO8UUeqxTQ0QEG6tyKBAHyQFet8XxXlmMHD/0/A7p9jJOOJ2NW0 UkSPo+TyA4w0tlj/bZA/T8RNKIz06U2EAskyoxhRV8rZmyES4ux2cPZ9DHqf9WKDmSZE F0FtF3ja9RVQjAiXcXSLPHmkFslSJNDTrqyPVCQhhwcpxc3VQJp+ZxMxp/JXj5jqi+zK BKAg== X-Gm-Message-State: ABy/qLapBSHste4brb9HCIl2Y8vrUwJZFW49E5iHHTZKjituitHAqywO 6q+axFfJ0MFkOm7Pa/D6aSSdYbA8JWQQT3rUlAOr9Q== X-Google-Smtp-Source: APBJJlEPu+YexuhjYmWzhTP52u0ebwVZEEvMJ1pgW4U/Y5vQV+EzzQzdBB+uq8s26v/TOtfC4Ua0DA== X-Received: by 2002:a6b:780d:0:b0:783:550e:33c0 with SMTP id j13-20020a6b780d000000b00783550e33c0mr168427iom.7.1690564159588; Fri, 28 Jul 2023 10:09:19 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id k17-20020a5e8911000000b0077e3566a801sm1279269ioj.29.2023.07.28.10.09.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 10:09:19 -0700 (PDT) Date: Fri, 28 Jul 2023 11:09:17 -0600 Subject: [PATCH 3/3] Implement DAP "source" request MIME-Version: 1.0 Message-Id: <20230728-dap-source-refs-v1-3-1bcc5cdffd44@adacore.com> References: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> In-Reply-To: <20230728-dap-source-refs-v1-0-1bcc5cdffd44@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This implements the DAP "source" request. I renamed the "loadedSources" function from "sources" to "loaded_sources" to avoid any confusion. I also moved the loadedSources test to the new sources.exp. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30691 --- gdb/python/lib/gdb/dap/sources.py | 24 ++++++++++++++++- gdb/testsuite/gdb.dap/basic-dap.exp | 3 --- gdb/testsuite/gdb.dap/sources.c | 22 ++++++++++++++++ gdb/testsuite/gdb.dap/sources.exp | 52 +++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 4 deletions(-) diff --git a/gdb/python/lib/gdb/dap/sources.py b/gdb/python/lib/gdb/dap/sources.py index 806352836db..7fa1ae430c8 100644 --- a/gdb/python/lib/gdb/dap/sources.py +++ b/gdb/python/lib/gdb/dap/sources.py @@ -82,5 +82,27 @@ def _sources(): @request("loadedSources") @capability("supportsLoadedSourcesRequest") -def sources(**extra): +def loaded_sources(**extra): return send_gdb_with_response(_sources) + + +# This helper is needed because we must only access the globals here +# from the gdb thread. +@in_gdb_thread +def _get_source(source): + filename = decode_source(source) + with open(filename) as f: + content = f.read() + return { + "content": content, + } + + +@request("source") +def source(*, source=None, sourceReference: int, **extra): + # The 'sourceReference' parameter is required by the spec, but is + # for backward compatibility, which I take to mean that the + # 'source' is preferred. + if source is None: + source = {"sourceReference": sourceReference} + return send_gdb_with_response(lambda: _get_source(source)) diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp index ef3c535f6a2..b0f8e624610 100644 --- a/gdb/testsuite/gdb.dap/basic-dap.exp +++ b/gdb/testsuite/gdb.dap/basic-dap.exp @@ -206,7 +206,4 @@ set obj [dap_check_request_and_response "command repl" \ set response [lindex $obj 0] gdb_assert {[dict get $response body result] == 23} -set obj [dap_check_request_and_response sources loadedSources] -gdb_assert {[string first basic-dap.c $obj] != -1} - dap_shutdown diff --git a/gdb/testsuite/gdb.dap/sources.c b/gdb/testsuite/gdb.dap/sources.c new file mode 100644 index 00000000000..599d1bd9f77 --- /dev/null +++ b/gdb/testsuite/gdb.dap/sources.c @@ -0,0 +1,22 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +main () +{ + /* Distinguishing comment. */ +} diff --git a/gdb/testsuite/gdb.dap/sources.exp b/gdb/testsuite/gdb.dap/sources.exp new file mode 100644 index 00000000000..8983b4d94e6 --- /dev/null +++ b/gdb/testsuite/gdb.dap/sources.exp @@ -0,0 +1,52 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test 'sources' and 'loadedSources'. + +require allow_dap_tests + +load_lib dap-support.exp + +standard_testfile + +if {[build_executable ${testfile}.exp $testfile] == -1} { + return +} + +if {[dap_launch $testfile {} {} 1] == ""} { + return +} + +set obj [dap_check_request_and_response loadedSources loadedSources] +set ref 0 +foreach src [dict get [lindex $obj 0] body sources] { + if {[file tail [dict get $src name]] == "sources.c"} { + set ref [dict get $src sourceReference] + } +} + +if {$ref == 0} { + fail "sources.c in loadedSources" +} else { + pass "sources.c in loadedSources" + + set obj [dap_check_request_and_response "get source" source \ + [format {o sourceReference [i %d]} $ref]] + set text [dict get [lindex $obj 0] body content] + gdb_assert {[string first "Distinguishing comment" $text] != -1} +} + + +dap_shutdown