performance tweaks to fixconflicts

DFHack · Aug 6, 2023 · dee10b4 · dee10b4
1 parent 5d7c18d
commit dee10b4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ghidra/FixConflicts.java b/ghidra/FixConflicts.java
@@ -46,6 +46,7 @@ protected void run() throws Exception {
 			String message = "Fixing " + String.valueOf(conflicts.size()) + " conflicts...";
 			println(message);
 			Instant start = Instant.now();
+			Instant lastSwing = Instant.now();
 			monitor.initialize(conflicts.size());
 			monitor.setMessage(message);
 			for (DataType dt : conflicts) {
@@ -69,7 +70,14 @@ protected void run() throws Exception {
 				}
 				dtm.replaceDataType(dt, good, false);
 				monitor.incrementProgress(1);
-				Swing.allowSwingToProcessEvents();
+
+				Duration swingElapsed = Duration.between(lastSwing, Instant.now());
+				if (swingElapsed.toMillis() > 1000)
+				{
+					Swing.allowSwingToProcessEvents();
+					lastSwing = Instant.now();
+				}
+
 				Duration elapsed = Duration.between(start, Instant.now());
 				if (elapsed.toMillis() > 60000)
 				{