Add DAP scope cache

Andry Ogorodnik, a co-worker, noticed that multiple "scopes" requests
with the same frame would yield different variableReference values in
the response.

This patch adds a regression test for this, and adds a scope cache in
scopes.py, ensuring that multiple identical requests will get the same
response.

Tested-By: Alexandra Petlanova Hajkova <ahajkova@redhat.com>
This commit is contained in:
Tom Tromey
2023-09-27 11:48:24 -06:00
parent c9d954f934
commit c1edbcf2ba
2 changed files with 36 additions and 9 deletions

View File

@ -21,6 +21,21 @@ from .server import request
from .varref import BaseReference
# Map DAP frame IDs to scopes. This ensures that scopes are re-used.
frame_to_scope = {}
# When the inferior is re-started, we erase all scope references. See
# the section "Lifetime of Objects References" in the spec.
@in_gdb_thread
def clear_scopes(event):
global frame_to_scope
frame_to_scope = {}
gdb.events.cont.connect(clear_scopes)
class _ScopeReference(BaseReference):
def __init__(self, name, hint, frame, var_list):
super().__init__(name)
@ -83,15 +98,20 @@ class _RegisterReference(_ScopeReference):
# Helper function to create a DAP scopes for a given frame ID.
@in_gdb_thread
def _get_scope(id):
frame = frame_for_id(id)
scopes = []
args = frame.frame_args()
if args:
scopes.append(_ScopeReference("Arguments", "arguments", frame, args))
locs = frame.frame_locals()
if locs:
scopes.append(_ScopeReference("Locals", "locals", frame, locs))
scopes.append(_RegisterReference("Registers", frame))
global frame_to_scope
if id in frame_to_scope:
scopes = frame_to_scope[id]
else:
frame = frame_for_id(id)
scopes = []
args = frame.frame_args()
if args:
scopes.append(_ScopeReference("Arguments", "arguments", frame, args))
locs = frame.frame_locals()
if locs:
scopes.append(_ScopeReference("Locals", "locals", frame, locs))
scopes.append(_RegisterReference("Registers", frame))
frame_to_scope[id] = scopes
return [x.to_object() for x in scopes]