Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-29 01:16:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/debugger'

Browse Source
This commit is contained in:
ghidra1
2021-04-16 16:08:56 -04:00
parent 52a46a2ce4 187aa1fa31
commit 24e476b990
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClientTargetObject.java
+1 -1
View File
@@ -41,7 +41,7 @@ public interface GadpClientTargetObject extends SpiTargetObject {
@GadpEventHandler(Gadp.EventNotification.EvtCase.OBJECT_INVALIDATE_EVENT) @GadpEventHandler(Gadp.EventNotification.EvtCase.OBJECT_INVALIDATE_EVENT)
default void handleObjectInvalidateEvent(Gadp.EventNotification notification) { default void handleObjectInvalidateEvent(Gadp.EventNotification notification) {
Gadp.ObjectInvalidateEvent evt = notification.getObjectInvalidateEvent(); Gadp.ObjectInvalidateEvent evt = notification.getObjectInvalidateEvent();
getDelegate().doInvalidate(this, evt.getReason()); getDelegate().invalidateSubtree(this, evt.getReason());
} }
@GadpEventHandler(Gadp.EventNotification.EvtCase.CACHE_INVALIDATE_EVENT) @GadpEventHandler(Gadp.EventNotification.EvtCase.CACHE_INVALIDATE_EVENT)
Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java
+2 -2
View File
@@ -1013,8 +1013,8 @@ public class GadpClientServerTest implements AsyncTestUtils {
ssAvail.setElements(List.of(new TestGadpTargetAvailable(ssAvail, 1, "cat") // ssAvail.setElements(List.of(new TestGadpTargetAvailable(ssAvail, 1, "cat") //
), "Changed"); ), "Changed");
waitOn(invL.count.waitValue(2)); waitOn(invL.count.waitUntil(c -> c >= 2));
waitOn(elemL.count.waitValue(2)); waitOn(elemL.count.waitUntil(c -> c >= 2));
for (TargetObject a : avail1.values()) { for (TargetObject a : avail1.values()) {
assertFalse(a.isValid()); assertFalse(a.isValid());
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java
+3
View File
@@ -243,6 +243,9 @@ public abstract class AbstractTargetObject<P extends TargetObject> implements Sp
} }
protected void doInvalidate(TargetObject branch, String reason) { protected void doInvalidate(TargetObject branch, String reason) {
if (!valid) {
return;
}
valid = false; valid = false;
model.objectInvalidated(getProxy()); model.objectInvalidated(getProxy());
listeners.fire.invalidated(getProxy(), branch, reason); listeners.fire.invalidated(getProxy(), branch, reason);