yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1750_Dan_dbTraceDeadlock' into patch

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-22 12:23:04 -04:00
commit c6b5149d27
1 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/util/DefaultTraceTimeViewport.java
View file

@ -186,6 +186,7 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
} }
protected boolean isLower(long lower) { protected boolean isLower(long lower) {
try (LockHold hold = trace.lockRead()) { // May not be necessary
synchronized (ordered) { synchronized (ordered) {
Range<Long> range = spanSet.rangeContaining(lower); Range<Long> range = spanSet.rangeContaining(lower);
if (range == null) { if (range == null) {
@ -194,6 +195,7 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
return range.lowerEndpoint().longValue() == lower; return range.lowerEndpoint().longValue() == lower;
} }
} }
}
protected static boolean addSnapRange(long lower, long upper, RangeSet<Long> spanSet, protected static boolean addSnapRange(long lower, long upper, RangeSet<Long> spanSet,
List<Range<Long>> ordered) { List<Range<Long>> ordered) {
@ -262,13 +264,13 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
List<Range<Long>> ordered = new ArrayList<>(); List<Range<Long>> ordered = new ArrayList<>();
try (LockHold hold = trace.lockRead()) { try (LockHold hold = trace.lockRead()) {
collectForkRanges(trace.getTimeManager(), snap, spanSet, ordered); collectForkRanges(trace.getTimeManager(), snap, spanSet, ordered);
}
synchronized (this.ordered) { synchronized (this.ordered) {
this.spanSet.clear(); this.spanSet.clear();
this.ordered.clear(); this.ordered.clear();
this.spanSet.addAll(spanSet); this.spanSet.addAll(spanSet);
this.ordered.addAll(ordered); this.ordered.addAll(ordered);
} }
}
assert !ordered.isEmpty(); assert !ordered.isEmpty();
changeListeners.fire.run(); changeListeners.fire.run();
} }
@ -322,26 +324,33 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
@Override @Override
public boolean isForked() { public boolean isForked() {
try (LockHold hold = trace.lockRead()) { // May not be necessary
synchronized (ordered) { synchronized (ordered) {
return ordered.size() > 1; return ordered.size() > 1;
} }
} }
}
public List<Range<Long>> getOrderedSpans() { public List<Range<Long>> getOrderedSpans() {
try (LockHold hold = trace.lockRead()) { // May not be necessary
synchronized (ordered) { synchronized (ordered) {
return List.copyOf(ordered); return List.copyOf(ordered);
} }
} }
}
public List<Range<Long>> getOrderedSpans(long snap) { public List<Range<Long>> getOrderedSpans(long snap) {
try (LockHold hold = trace.lockRead()) { // setSnap requires this
synchronized (ordered) { synchronized (ordered) {
setSnap(snap); setSnap(snap);
return getOrderedSpans(); return getOrderedSpans();
} }
} }
}
@Override @Override
public List<Long> getOrderedSnaps() { public List<Long> getOrderedSnaps() {
try (LockHold hold = trace.lockRead()) { // May not be necessary
synchronized (ordered) { synchronized (ordered) {
return ordered return ordered
.stream() .stream()
@ -349,9 +358,11 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }
}
@Override @Override
public List<Long> getReversedSnaps() { public List<Long> getReversedSnaps() {
try (LockHold hold = trace.lockRead()) { // May not be necessary
synchronized (ordered) { synchronized (ordered) {
return Lists.reverse(ordered) return Lists.reverse(ordered)
.stream() .stream()
@ -359,6 +370,7 @@ public class DefaultTraceTimeViewport implements TraceTimeViewport {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }
}
@Override @Override
public <T> T getTop(Function<Long, T> func) { public <T> T getTop(Function<Long, T> func) {