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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-22 12:42:15 -04:00
commit fee687739b
4 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceProxyPlugin.java
View file

@ -161,6 +161,9 @@ public class DebuggerModelServiceProxyPlugin extends Plugin
@Override
public void elementAdded(DebuggerObjectModel element) {
modelListeners.fire.elementAdded(element);
if (currentModel == null) {
activateModel(element);
}
}
@Override

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

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

5
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java
View file

@ -39,7 +39,8 @@ import ghidra.framework.Application;
import ghidra.framework.options.SaveState;
import ghidra.framework.plugintool.PluginTool;
import ghidra.util.Msg;
import ghidra.util.task.*;
import ghidra.util.task.TaskLauncher;
import ghidra.util.task.TaskMonitor;
/**
* Hosts the embedded OSGi framework and manages {@link GhidraBundle}s.
@ -261,7 +262,7 @@ public class BundleHost {
}
Bundle installFromPath(Path p) throws GhidraBundleException {
return installFromLoc("file://" + p.toAbsolutePath().normalize().toString());
return installFromLoc(p.toUri().toString());
}
/**

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/GhidraJarBundle.java
View file

@ -48,7 +48,7 @@ public class GhidraJarBundle extends GhidraBundle {
public GhidraJarBundle(BundleHost bundleHost, ResourceFile file, boolean enabled,
boolean systemBundle) {
super(bundleHost, file, enabled, systemBundle);
this.bundleLocation = "file://" + file.getAbsolutePath().toString();
this.bundleLocation = file.toURI().toString();
}
@Override