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

GP-1154: Trying to resolve yet another trace-related deadlock

Browse source
This commit is contained in:
Dan 2021-07-22 17:08:32 -04:00
parent fa4a390309
commit c8316abaaa
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTrace.java
View file

@ -524,7 +524,8 @@ public class DBTrace extends DBCachedDomainObjectAdapter implements Trace, Trace
} }
@Override @Override
public DBTraceProgramView getFixedProgramView(long snap) { // NOTE: addListener synchronizes on this and might generate callbacks immediately
public synchronized DBTraceProgramView getFixedProgramView(long snap) {
// NOTE: The new viewport will need to read from the time manager during init // NOTE: The new viewport will need to read from the time manager during init
try (LockHold hold = lockRead()) { try (LockHold hold = lockRead()) {
synchronized (fixedProgramViews) { synchronized (fixedProgramViews) {
@ -538,7 +539,8 @@ public class DBTrace extends DBCachedDomainObjectAdapter implements Trace, Trace
} }
@Override @Override
public DBTraceVariableSnapProgramView createProgramView(long snap) { // NOTE: Ditto getFixedProgramView
public synchronized DBTraceVariableSnapProgramView createProgramView(long snap) {
// NOTE: The new viewport will need to read from the time manager during init // NOTE: The new viewport will need to read from the time manager during init
try (LockHold hold = lockRead()) { try (LockHold hold = lockRead()) {
synchronized (programViews) { synchronized (programViews) {