Changeset 712

Timestamp:

04/11/10 12:02:58 (2 years ago)

Author:

conrad

Message:

Track dlopen'd module pointers, dlclose on purge()

This adds remix_unload() functions to loaded modules, calls
plugin->destroy, and keeps a module pointer returned by dlopen() in
remix_plugin.c and remix_ladspa.c.

Files:

• libremix/trunk/TODO (modified) (1 diff)
• libremix/trunk/src/libremix/remix_context.c (modified) (1 diff)
• libremix/trunk/src/libremix/remix_plugin.c (modified) (4 diffs)
• libremix/trunk/src/libremix/remix_private.h (modified) (1 diff)
• libremix/trunk/src/plugins/ladspa/remix_ladspa.c (modified) (3 diffs)

libremix/trunk/TODO

@@ -14 +14 @@
-
-ladspa:
-        * implement plugin->destroy
-        * keep module pointer returned by dlopen() in remix-ladspa.c, and
-          call dlclose() on that from remix_purge().
-        * free schemes created for each ladspa port

libremix/trunk/src/libremix/remix_context.c

@@ -48 +48 @@
-  world->purging = 1;
-
-cd_list_apply (env, world->plugins, (CDFunc)
-world->plugins = cd_list_free (env, world->plugins
-
-XXX
-XXX
+world->plugins = cd_list_destroy_with (env, world->plugins, 
+remix_plugin_defaults_unload (env
+
+TODO
+TODO
-  remix_channelset_defaults_destroy (env);
-  remix_free (ctx);

libremix/trunk/src/libremix/remix_plugin.c

@@ -42 +42 @@
-#include "remix.h"
-
+static CDList * modules_list = CD_EMPTY_LIST;
+
-static CDList *
-remix_plugin_initialise_static (RemixEnv * env)
@@ -60 +62 @@
-{
-  void * module;
+  CDList * l;
-  RemixPluginInitFunc init;
-
@@ -70 +73 @@
-    return CD_EMPTY_LIST;
-  }
+
+  /* Check that this module has not already been loaded (eg. if it is
+   * a symlink etc.) */
+  for (l = modules_list; l; l = l->next) {
+    if (l->data.s_pointer == module) {
+      dlclose (module);
+      return CD_EMPTY_LIST;
+    }
+  }
+
+  modules_list = cd_list_append (env, modules_list, CD_POINTER(module));
-
-  if ((init = dlsym (module, "remix_load")) != NULL) {
@@ -131 +145 @@
-}
-
+static int
+remix_plugin_unload (RemixEnv * env, void * module)
+{
+  RemixPluginInitFunc unload; /* TODO: make new unload type */
+
+  if ((unload = dlsym (module, "remix_unload")) != NULL) {
+    unload (env);
+  }
+
+  dlclose (module);
+
+  return 0;
+}
+
+void
+remix_plugin_defaults_unload (RemixEnv * env)
+{
+  CDList * l;
+
+  modules_list = cd_list_destroy_with (env, modules_list, (CDDestroyFunc)remix_plugin_unload);
+}
+
-#if 0
-

libremix/trunk/src/libremix/remix_private.h

@@ -287 +287 @@
-/* remix_plugin */
-void remix_plugin_defaults_initialise (RemixEnv * env);
+void remix_plugin_defaults_unload (RemixEnv * env);
-
-/* remix_deck */

libremix/trunk/src/plugins/ladspa/remix_ladspa.c

@@ -874 +874 @@
-  RemixMetaText * mt;
-  RemixParameterScheme * scheme;
-
+l, * 
-#define BUF_LEN 256
-  static char buf[BUF_LEN];
@@ -886 +886 @@
-  module = dlopen (path, RTLD_NOW);
-  if (!module) return CD_EMPTY_LIST;
+
+  /* Check that this module has not already been loaded (eg. if it is
+   * a symlink etc.) */
+  for (l = modules_list; l; l = l->next) {
+    if (l->data.s_pointer == module) {
+      dlclose (module);
+      return CD_EMPTY_LIST;
+    }
+  }
+
+  modules_list = cd_list_append (env, modules_list, CD_POINTER(module));
-
-  if ((desc_func = dlsym (module, "ladspa_descriptor"))) {
@@ -1029 +1040 @@
-    dlclose(l->data.s_pointer);
-  }
-
-
+
+
+
+