mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-1484: Sort out race for default trace naming during auto-save.

Browse Source
This commit is contained in:
Dan
2023-01-18 16:11:40 -05:00
parent 79c0f3f1de
commit 8eaf15764b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServicePlugin.java
View File

@@ -905,13 +905,7 @@ public class DebuggerTraceManagerServicePlugin extends Plugin
});
}
else {
String filename = trace.getName();
DomainFolder root = tool.getProject().getProjectData().getRootFolder();
DomainFile existing = root.getFile(filename);
for (int i = 1; existing != null; i++) {
filename = trace.getName() + "." + i;
existing = root.getFile(filename);
}
DomainFolder traces;
try {
traces = createOrGetFolder(tool, "Save New Trace", root, NEW_TRACES_FOLDER_NAME);
@@ -920,12 +914,20 @@ public class DebuggerTraceManagerServicePlugin extends Plugin
throw new AssertionError(e);
}
final String finalFilename = filename;
new TaskLauncher(new Task("Save New Trace", true, true, true) {
@Override
public void run(TaskMonitor monitor) throws CancelledException {
String filename = trace.getName();
try (DomainObjectLockHold hold = maybeLock(trace, force)) {
traces.createFile(finalFilename, trace, monitor);
for (int i = 1;; i++) {
try {
traces.createFile(filename, trace, monitor);
break;
}
catch (DuplicateFileException e) {
filename = trace.getName() + "." + i;
}
}
trace.save("Initial save", monitor);
future.complete(null);
}