Changeset 5320:d583f3008d43 in roaraudio for libroar/plugincontainer.c

Timestamp:

12/04/11 20:02:31 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support usage counter and started to implement roar_plugincontainer_load()

File:

• libroar/plugincontainer.c (modified) (4 diffs)

libroar/plugincontainer.c

@@ -42 +42 @@
  struct roar_dl_librarypara * default_para;
  struct roar_dl_lhandle * handle[MAX_PLUGINS];
+ size_t deprefc[MAX_PLUGINS];
+ size_t numhandles;
  // TODO: add a depref counter so we do not unload libs we depend on.
 };
@@ -115 +117 @@
   return 0;
 
- for (i = 0; i < MAX_PLUGINS; i++) {
-  if ( cont->handle[i] == NULL )
-   continue;
-
-  roar_dl_close(cont->handle[i]);
+ while (cont->numhandles) {
+  for (i = 0; i < MAX_PLUGINS; i++) {
+   if ( cont->handle[i] == NULL )
+    continue;
+
+   // skip plugins in use by others. We will unload them in a later loop.
+   if ( cont->deprefc[i] )
+    continue;
+
+   roar_dl_close(cont->handle[i]);
+  }
  }
 
@@ -131 +139 @@
 
 // plugin loading and unloading:
-int roar_plugincontainer_load(struct roar_plugincontainer * cont, const char * name, struct roar_dl_librarypara * para);
+int roar_plugincontainer_load(struct roar_plugincontainer * cont, const char * name, struct roar_dl_librarypara * para) {
+ ssize_t idx = -1;
+ size_t i;
+
+ if ( cont == NULL || name == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( para == NULL )
+  para = cont->default_para;
+ // we do not need to _ref(para) here. This will be done by the roardl open function.
+
+
+ // search for a free index.
+ if ( cont->numhandles == MAX_PLUGINS ) {
+  // return early if we are full.
+  roar_err_set(ROAR_ERROR_NOSPC);
+  return -1;
+ }
+ for (i = 0; i < MAX_PLUGINS; i++) {
+  if ( cont->handle[i] == NULL ) {
+   idx = i;
+   break;
+  }
+ }
+
+ if ( idx == -1 ) {
+  roar_err_set(ROAR_ERROR_NOSPC);
+  return -1;
+ }
+
+ if ( strstr(name, "/") != NULL ) {
+  cont->handle[idx] = roar_dl_open(name, ROAR_DL_FLAG_DEFAULTS, 1, para);
+  if ( cont->handle[idx] == NULL )
+   return -1;
+
+  cont->deprefc[idx] = 0;
+  cont->numhandles++;
+
+  return 0;
+ } else {
+  roar_err_set(ROAR_ERROR_NOSYS);
+  return -1;
+ }
+
+ roar_err_set(ROAR_ERROR_NOSYS);
+ return -1;
+}
+
 int roar_plugincontainer_unload(struct roar_plugincontainer * cont, const char * name) {
  // get b name, then call roar_plugincontainer_unload_lhandle().
@@ -153 +210 @@
  for (i = 0; i < MAX_PLUGINS; i++) {
   if ( cont->handle[i] == lhandle ) {
+   if ( cont->deprefc[i] ) {
+    // still in use.
+    roar_err_set(ROAR_ERROR_BUSY);
+    return -1;
+   }
    roar_dl_close(cont->handle[i]);
    cont->handle[i] = NULL;
+   cont->numhandles--;
    return 0;
   }