Improve performance and logging in handler utilities

Increased decompiler cache refresh delay in SetPlateComment for reliability. Enhanced DecompileFunctionByAddress to use DecompInterface directly and improved error handling. Added progress logging for comment setting in DocumentFunctionComplete. Optimized BatchRenameVariables by suppressing events during batch renames to avoid repeated re-analysis. Updated ParseUtils to support HTTP keep-alive and improved type safety in map conversion.

Author: DaCodeChick

src/main/java/com/lauriewired/handlers/comments/SetPlateComment.java

@@ -89,9 +89,9 @@ private String setPlateComment(String functionAddress, String comment) {
 			// Force event processing to ensure changes propagate to decompiler cache
 			if (success.get()) {
 				program.flushEvents();
-				// Small delay to ensure decompiler cache refresh
+				// Increased delay to ensure decompiler cache refresh
 				try {
-					Thread.sleep(50);
+					Thread.sleep(200);
 				} catch (InterruptedException e) {
 					Thread.currentThread().interrupt();
 				}

src/main/java/com/lauriewired/handlers/functions/DecompileFunctionByAddress.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.util.Map;
 
+import static com.lauriewired.GhidraMCPPlugin.*;
 import static com.lauriewired.util.GhidraUtils.decompileFunctionInProgram;
 import static com.lauriewired.util.ParseUtils.*;
 import static ghidra.program.util.GhidraProgramUtilities.getCurrentProgram;
@@ -52,22 +53,22 @@ public void handle(HttpExchange exchange) throws IOException {
 	 * @return the decompiled C code or an error message
 	 */
 	private String decompileFunctionByAddress(String addressStr) {
-		Program program = getCurrentProgram(tool);
-		if (program == null)
-			return "No program loaded";
-		if (addressStr == null || addressStr.isEmpty())
-			return "Address is required";
+		Program program = getCurrentProgram();
+		if (program == null) return "No program loaded";
+		if (addressStr == null || addressStr.isEmpty()) return "Address is required";
 
 		try {
 			Address addr = program.getAddressFactory().getAddress(addressStr);
-			Function func = program.getListing().getFunctionContaining(addr);
-			if (func == null)
-				return "No function found at or containing address " + addressStr;
+			Function func = getFunctionForAddress(program, addr);
+			if (func == null) return "No function found at or containing address " + addressStr;
 
-			String decompCode = decompileFunctionInProgram(func, program);
-            return (decompCode != null && !decompCode.isEmpty()) 
-                ? decompCode 
-                : "Decompilation failed";
+			DecompInterface decomp = new DecompInterface();
+			decomp.openProgram(program);
+			DecompileResults result = decomp.decompileFunction(func, DECOMPILE_TIMEOUT_SECONDS, new ConsoleTaskMonitor());
+
+			return (result != null && result.decompileCompleted()) 
+				? result.getDecompiledFunction().getC() 
+				: "Decompilation failed";
 		} catch (Exception e) {
 			return "Error decompiling function: " + e.getMessage();
 		}

src/main/java/com/lauriewired/handlers/functions/DocumentFunctionComplete.java

@@ -207,16 +207,23 @@ private String documentFunctionComplete(String functionAddress, String newName,
 								if (cAddr != null) {
 									program.getListing().setComment(cAddr, CodeUnit.PRE_COMMENT, commentText);
 									commentsSet++;
+									// Log progress every 10 comments
+									if (commentsSet % 10 == 0) {
+										Msg.info(this, "Progress: " + commentsSet + "/" + totalComments + " decompiler comments set");
+									}
 								}
 							}
 						}
 						operationsCompleted.incrementAndGet();
 						result.append("\"decompiler_comments_set\": ").append(commentsSet).append(", ");
+						Msg.info(this, "Completed: " + commentsSet + " decompiler comments set");
 					}
 
-					// Set disassembly comments
+					// Set disassembly comments with process logging
 					if (disassemblyComments != null && !disassemblyComments.isEmpty()) {
 						int commentsSet = 0;
+						int totalComments = disassemblyComments.size();
+						Msg.info(this, "Setting " + totalComments + " disassembly comments...");
 						for (Map<String, String> comment : disassemblyComments) {
 							String commentAddr = comment.get("address");
 							String commentText = comment.get("comment");
@@ -225,11 +232,16 @@ private String documentFunctionComplete(String functionAddress, String newName,
 								if (cAddr != null) {
 									program.getListing().setComment(cAddr, CodeUnit.EOL_COMMENT, commentText);
 									commentsSet++;
+									// Log progress every 10 comments
+									if (commentsSet % 10 == 0) {
+										Msg.info(this, "Progress: " + commentsSet + "/" + totalComments + " disassembly comments set");
+									}
 								}
 							}
 						}
 						operationsCompleted.incrementAndGet();
 						result.append("\"disassembly_comments_set\": ").append(commentsSet).append(", ");
+						Msg.info(this, "Completed: " + commentsSet + " disassembly comments set");
 					}
 
 					result.append("\"operations_completed\": ").append(operationsCompleted.get());

src/main/java/com/lauriewired/handlers/variables/BatchRenameVariables.java

@@ -66,6 +66,10 @@ private String batchRenameVariables(String functionAddress, Map<String, String>
 		try {
 			SwingUtilities.invokeAndWait(() -> {
 				int tx = program.startTransaction("Batch Rename Variables");
+				// Suppress events during batch operation to prevent re-analysis on each rename
+				int eventTx = program.startTransaction("Suppress Events");
+				program.flushEvents();  // Flush any pending events before we start
+				
 				try {
 					Address addr = program.getAddressFactory().getAddress(functionAddress);
 					if (addr == null) {
@@ -80,7 +84,7 @@ private String batchRenameVariables(String functionAddress, Map<String, String>
 					}
 
 					if (variableRenames != null && !variableRenames.isEmpty()) {
-						// Rename parameters
+						// Rename parameters (events suppressed - no re-analysis per rename)
 						for (Parameter param : func.getParameters()) {
 							String newName = variableRenames.get(param.getName());
 							if (newName != null && !newName.isEmpty()) {
@@ -94,7 +98,7 @@ private String batchRenameVariables(String functionAddress, Map<String, String>
 							}
 						}
 
-						// Rename local variables
+						// Rename local variables (events suppressed - no re-analysis per rename)
 						for (Variable local : func.getLocalVariables()) {
 							String newName = variableRenames.get(local.getName());
 							if (newName != null && !newName.isEmpty()) {
@@ -114,6 +118,9 @@ private String batchRenameVariables(String functionAddress, Map<String, String>
 					result.append("\"error\": \"").append(e.getMessage().replace("\"", "\\\"")).append("\"");
 					Msg.error(this, "Error in batch rename variables", e);
 				} finally {
+					// End event suppression transaction - this triggers ONE re-analysis for all renames
+					program.endTransaction(eventTx, success.get());
+					program.flushEvents();  // Force event processing now that we're done
 					program.endTransaction(tx, success.get());
 				}
 			});

src/main/java/com/lauriewired/util/ParseUtils.java

@@ -14,6 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.lauriewired.GhidraMCPPlugin.*;
+
 /**
  * Utility methods for parsing HTTP requests and responses.
  * 
@@ -56,26 +58,26 @@ public FieldDefinition(String name, String type, int offset) {
 	 * @return A list of maps if the object is a list of maps, otherwise null.
 	 */
 	@SuppressWarnings("unchecked")
-    public static List<Map<String, String>> convertToMapList(Object obj) {
-        if (obj == null) {
-            return null;
-        }
+	public static List<Map<String, String>> convertToMapList(Object obj) {
+		if (obj == null) {
+			return null;
+		}
 
-        if (obj instanceof List) {
-            List<Object> objList = (List<Object>) obj;
-            List<Map<String, String>> result = new ArrayList<>();
+		if (obj instanceof List) {
+			List<Object> objList = (List<Object>) obj;
+			List<Map<String, String>> result = new ArrayList<>();
 
-            for (Object item : objList) {
-                if (item instanceof Map) {
-                    result.add((Map<String, String>) item);
-                }
-            }
+			for (Object item : objList) {
+				if (item instanceof Map) {
+					result.add((Map<String, String>) item);
+				}
+			}
 
-            return result;
-        }
+			return result;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
 	/**
 	 * Decode a hexadecimal string into a byte array.
@@ -506,7 +508,11 @@ public static Map<String, Long> parseValuesJson(String valuesJson) {
 	 */
 	public static void sendResponse(HttpExchange exchange, String response) throws IOException {
 		byte[] bytes = response.getBytes(StandardCharsets.UTF_8);
-		exchange.getResponseHeaders().set("Content-Type", "text/plain; charset=utf-8");
+		Headers headers = exchange.getResponseHeaders();
+		headers.set("Content-Type", "text/plain; charset=utf-8");
+		// Enable HTTP keep-alive for long-running operations
+		headers.set("Connection", "keep-alive");
+		headers.set("Keep-Alive", "timeout=" + HTTP_IDLE_TIMEOUT_SECONDS + ", max=100");
 		exchange.sendResponseHeaders(200, bytes.length);
 		try (OutputStream os = exchange.getResponseBody()) {
 			os.write(bytes);