Changeset 5429:f180386475c4 in roaraudio

Timestamp:

03/20/12 12:45:10 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to unload plugins from plugin container

Files:

• include/libroar/plugincontainer.h (modified) (1 diff)
• libroar/plugincontainer.c (modified) (5 diffs)

include/libroar/plugincontainer.h

@@ -55 +55 @@
 
 // plugin loading and unloading:
-int roar_plugincontainer_load(struct roar_plugincontainer * cont, const char * name, struct roar_dl_librarypara * para);
-#if 0
-int roar_plugincontainer_unload(struct roar_plugincontainer * cont, const char * name);
-int roar_plugincontainer_unload_lhandle(struct roar_plugincontainer * cont, struct roar_dl_lhandle * lhandle);
-#endif
+int                      roar_plugincontainer_load            (struct roar_plugincontainer * cont,
+                                                               const char * name,
+                                                               struct roar_dl_librarypara * para);
+struct roar_dl_lhandle * roar_plugincontainer_load_lhandle    (struct roar_plugincontainer * cont,
+                                                               const char * name,
+                                                               struct roar_dl_librarypara * para);
+int                      roar_plugincontainer_unload          (struct roar_plugincontainer * cont,
+                                                               const char * name);
+int                      roar_plugincontainer_unload_lhandle  (struct roar_plugincontainer * cont,
+                                                               struct roar_dl_lhandle * lhandle);
 
 // appsched:

libroar/plugincontainer.c

@@ -141 +141 @@
 // plugin loading and unloading:
 int roar_plugincontainer_load(struct roar_plugincontainer * cont, const char * name, struct roar_dl_librarypara * para) {
+ struct roar_dl_lhandle * ret = roar_plugincontainer_load_lhandle(cont, name, para);
+
+ if ( ret == NULL )
+  return -1;
+
+ roar_dl_unref(ret);
+
+ return 0;
+}
+
+struct roar_dl_lhandle * roar_plugincontainer_load_lhandle    (struct roar_plugincontainer * cont,
+                                                               const char * name,
+                                                               struct roar_dl_librarypara * para) {
  ssize_t idx = -1;
  size_t i;
@@ -146 +159 @@
  if ( cont == NULL || name == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
+  return NULL;
  }
 
@@ -158 +171 @@
   // return early if we are full.
   roar_err_set(ROAR_ERROR_NOSPC);
-  return -1;
+  return NULL;
  }
  for (i = 0; i < MAX_PLUGINS; i++) {
@@ -169 +182 @@
  if ( idx == -1 ) {
   roar_err_set(ROAR_ERROR_NOSPC);
-  return -1;
+  return NULL;
  }
 
  cont->handle[idx] = roar_dl_open(name, ROAR_DL_FLAG_PLUGIN, 1, para);
  if ( cont->handle[idx] == NULL )
-  return -1;
+  return NULL;
 
  cont->deprefc[idx] = 0;
  cont->numhandles++;
 
- return 0;
-}
-
-#if 0
+ roar_dl_ref(cont->handle[idx]);
+ return cont->handle[idx];
+}
+
 int roar_plugincontainer_unload(struct roar_plugincontainer * cont, const char * name) {
- // get b name, then call roar_plugincontainer_unload_lhandle().
- roar_err_set(ROAR_ERROR_NOSYS);
+ const struct roar_dl_libraryname * libname;
+ size_t i;
+
+ if ( cont == NULL || name == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ for (i = 0; i < MAX_PLUGINS; i++) {
+  if ( cont->handle[i] == NULL )
+   continue;
+  libname = roar_dl_getlibname(cont->handle[i]);
+  if ( libname == NULL )
+   continue;
+
+  if ( !strcmp(libname->name, name) )
+   return roar_plugincontainer_unload_lhandle(cont, cont->handle[i]);
+ }
+
+ roar_err_set(ROAR_ERROR_NOENT);
  return -1;
 }
@@ -219 +250 @@
  return -1;
 }
-#endif
 
 // appsched: