Free engine (#613)

* glue for free engine * fix free-engine command * sync with server after engine dealloc. might help with cpu spikes when switching engines
monome · Oct 22, 2018 · ec29ae9 · ec29ae9
1 parent 6843b36
commit ec29ae9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/matron/src/oracle.c b/matron/src/oracle.c
@@ -252,6 +252,10 @@ void o_load_engine(const char *name) {
     lo_send(remote_addr, "/engine/load/name", "s", name);
 }
 
+void o_free_engine() {
+    lo_send(remote_addr, "/engine/free", "");
+}
+
 void o_send_command(const char *name, lo_message msg) {
     char *path;
     // FIXME: better not to allocate here

diff --git a/matron/src/oracle.h b/matron/src/oracle.h
@@ -73,6 +73,8 @@ extern void o_unlock_descriptors();
 
 // load a named audio processing engine
 extern void o_load_engine(const char *name);
+// free engine
+extern void o_free_engine(void);
 
 // request list of engine names
 extern void o_request_engine_report(void);

diff --git a/matron/src/weaver.c b/matron/src/weaver.c
@@ -103,6 +103,7 @@ static int _midi_send(lua_State *l);
 /// engines
 static int _request_engine_report(lua_State *l);
 static int _load_engine(lua_State *l);
+static int _free_engine(lua_State *l);
 /// commands
 static int _send_command(lua_State *l);
 static int _start_poll(lua_State *l);
@@ -239,6 +240,8 @@ void w_init(void) {
   lua_register(lvm, "report_engines", &_request_engine_report);
   // load a named engine
   lua_register(lvm, "load_engine", &_load_engine);
+  // free engine
+  lua_register(lvm, "free_engine", &_free_engine);
 
   // send an indexed command
   lua_register(lvm, "send_command", &_send_command);
@@ -1093,6 +1096,16 @@ int _load_engine(lua_State *l) {
   return 0;
 }
 
+int _free_engine(lua_State *l) {
+  if (lua_gettop(l) != 0) {
+    return luaL_error(l, "wrong number of arguments");
+  }
+
+  o_free_engine();
+  lua_settop(l, 0);
+  return 0;
+}
+
 int _send_command(lua_State *l) {
   int nargs = lua_gettop(l);
   if (nargs < 1) {

diff --git a/sc/core/Crone.sc b/sc/core/Crone.sc
@@ -361,7 +361,8 @@ Crone {
 
 			// @function /engine/free
 			'/engine/free':OSCFunc.new({
-				if(engine.notNil, { engine.free; });
+				postln("attempt to free engine");
+				if(engine.notNil, { postln("freeing engine"); engine.deinit; });
 			}, '/engine/free'),
 
 			// @function /engine/load/name

diff --git a/sc/core/CroneEngine.sc b/sc/core/CroneEngine.sc
@@ -50,6 +50,7 @@ CroneEngine {
 			});
 			// subclass should implement free, and this method should also be called in a routine
 			this.free;
+			Crone.server.sync;
 			doneCallback.value(this);
 		}