WIP

java/ghidra/re3lib/FunctionDatabase.java

@@ -19,7 +19,7 @@ import ghidra.app.script.GhidraScript;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.Function;
 
-public class FunctionDatabase {
+public class FunctionDatabase implements AutoCloseable {
   public enum Type {
     Auto(0),
     Fix(1),
@@ -359,8 +359,8 @@ public class FunctionDatabase {
   }
 
   public void applyDefaultFilters(boolean rebuildAllGlobals) throws Exception {
-    GlobalDumper globalDumper = new GlobalDumper(script);
-    FunctionDumper dumper = new FunctionDumper(script, globalDumper);
+    GlobalDumper globalDumper = new GlobalDumper(script, this);
+    FunctionDumper dumper = new FunctionDumper(script, this, globalDumper);
 
     if (rebuildAllGlobals) {
       globalDumper.removeGlobalManifest();
@@ -484,4 +484,9 @@ public class FunctionDatabase {
       typeDumper.run();
     }
   }
+
+  @Override
+  public void close() throws Exception {
+    this.disconnect();
+  }
 }