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

Merge remote-tracking branch 'origin/GP-1859_d-millar_deadlock_fix--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-25 02:07:04 -04:00
commit 883f5a687a
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectAdapter.java
View file

@ -261,7 +261,7 @@ public abstract class DomainObjectAdapter implements DomainObject {
* @see ghidra.framework.model.DomainObject#addListener(ghidra.framework.model.DomainObjectListener)
*/
@Override
public synchronized void addListener(DomainObjectListener l) {
public void addListener(DomainObjectListener l) {
docs.addListener(l);
}
@ -269,7 +269,7 @@ public abstract class DomainObjectAdapter implements DomainObject {
* @see ghidra.framework.model.DomainObject#removeListener(ghidra.framework.model.DomainObjectListener)
*/
@Override
public synchronized void removeListener(DomainObjectListener l) {
public void removeListener(DomainObjectListener l) {
docs.removeListener(l);
}

24
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectChangeSupport.java
View file

@ -39,12 +39,12 @@ class DomainObjectChangeSupport {
/**
* Constructs a new DomainObjectChangeSupport object.
*
* @param src The object to be put as the src for all events generated.
* @param timeInterval The time (in milliseconds) this object will wait before
* flushing its event buffer. If a new event comes in before the time expires,
* the timer is reset.
* @param lock the lock used to verify that calls to {@link #flush()} are not performed
* while a lock is held; this is the lock to guard the DB
* @param timeInterval The time (in milliseconds) this object will wait before flushing its
* event buffer. If a new event comes in before the time expires, the timer is reset.
* @param lock the lock used to verify that calls to {@link #flush()} are not performed while a
* lock is held; this is the lock to guard the DB
*/
DomainObjectChangeSupport(DomainObject src, int timeInterval, int bufsize, Lock lock) {
@ -64,11 +64,15 @@ class DomainObjectChangeSupport {
// Capture the pending event to send to the existing listeners. This prevents the new
// listener from getting events registered before the listener was added.
DomainObjectChangedEvent pendingEvent = convertEventQueueRecordsToEvent();
List<DomainObjectListener> previousListeners = atomicAddListener(listener);
DomainObjectChangedEvent pendingEvent;
List<DomainObjectListener> previousListeners;
synchronized (src) {
pendingEvent = convertEventQueueRecordsToEvent();
previousListeners = atomicAddListener(listener);
}
/*
* Do later so that we do not get this deadlock:
* Do outside the synchronized block, so that we do not get this deadlock:
* Thread1 has Domain Lock -> wants AWT lock
* Swing has AWT lock -> wants Domain lock
*/
@ -77,7 +81,9 @@ class DomainObjectChangeSupport {
}
void removeListener(DomainObjectListener listener) {
listeners.remove(listener);
synchronized (src) {
listeners.remove(listener);
}
}
private void sendEventNow() {