yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GP-690: Protecting model/manager threads from user callbacks.

Browse source
This commit is contained in:
Dan 2021-02-12 14:59:44 -05:00
parent 2ed29f5693
commit 56f3f5c656
7 changed files with 87 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModel.java
View file

@ -18,6 +18,7 @@ package ghidra.dbg;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import ghidra.async.AsyncUtils;
import ghidra.async.TypeSpec;
@ -501,4 +502,11 @@ public interface DebuggerObjectModel {
Msg.error(origin, message, ex);
}
}
/**
* Get the executor used to invoke client callback routines
*
* @return the executor
*/
Executor getClientExecutor();
}

11
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractDebuggerObjectModel.java
View file

@ -15,12 +15,16 @@
*/
package ghidra.dbg.agent;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import ghidra.dbg.DebuggerModelListener;
import ghidra.util.datastruct.ListenerSet;
public abstract class AbstractDebuggerObjectModel implements SpiDebuggerObjectModel {
protected final Executor clientExecutor = Executors.newSingleThreadExecutor();
protected final ListenerSet<DebuggerModelListener> listeners =
new ListenerSet<>(DebuggerModelListener.class);
new ListenerSet<>(DebuggerModelListener.class, clientExecutor);
@Override
public void addModelListener(DebuggerModelListener listener) {
@ -31,4 +35,9 @@ public abstract class AbstractDebuggerObjectModel implements SpiDebuggerObjectMo
public void removeModelListener(DebuggerModelListener listener) {
listeners.remove(listener);
}
@Override
public Executor getClientExecutor() {
return clientExecutor;
}
}

4
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java
View file

@ -55,11 +55,11 @@ public abstract class AbstractTargetObject<P extends TargetObject>
protected boolean valid = true;
protected final ListenerSet<TargetObjectListener> listeners =
new ListenerSet<>(TargetObjectListener.class);
protected final ListenerSet<TargetObjectListener> listeners;
public AbstractTargetObject(DebuggerObjectModel model, P parent, String key, String typeHint,
TargetObjectSchema schema) {
this.listeners = new ListenerSet<>(TargetObjectListener.class, model.getClientExecutor());
this.model = model;
this.parent = parent;
this.completedParent = CompletableFuture.completedFuture(parent);