Changeset 5275:811818eb5b81 in roaraudio for roard/plugins.c

Timestamp:

11/19/11 22:54:26 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved plugin loader a lot (Closes: #190)

File:

• roard/plugins.c (modified) (6 diffs)

roard/plugins.c

@@ -31 +31 @@
  struct roar_dl_lhandle     * lhandle;
  struct roard_plugins_sched * sched;
+ int protocols[MAX_PROTOS];
 } g_plugins[MAX_PLUGINS];
 static struct _roard_plugin * _pp = NULL;
@@ -53 +54 @@
 }
 
+static void inline plugins_delete(struct _roard_plugin * plugin) {
+ int i;
+
+ if ( plugin->sched != NULL )
+  if ( plugin->sched->free != NULL )
+   plugin->sched->free();
+
+ for (i = 0; i < MAX_PROTOS; i++) {
+  if ( plugin->protocols[i] != -1 ) {
+   clients_unregister_proto(plugin->protocols[i]);
+  }
+ }
+
+ roar_dl_close(plugin->lhandle);
+ memset(plugin, 0, sizeof(struct _roard_plugin));
+ plugin->lhandle = NULL;
+}
+
 int plugins_init  (void) {
  int i;
@@ -62 +81 @@
    _pp->sched = NULL;
 
-   roar_dl_ra_init(g_plugins[i].lhandle, NULL);
+   if ( roar_dl_ra_init(g_plugins[i].lhandle, NULL, NULL) == -1 ) {
+    ROAR_WARN("plugins_init(void): Can not RA init lib at %p: %s", g_plugins[i].lhandle, roar_error2str(roar_error));
+    plugins_delete(&(g_plugins[i]));
+    continue;
+   }
 
    if ( g_plugins[i].sched != NULL )
@@ -80 +103 @@
  for (i = 0; i < MAX_PLUGINS; i++) {
   if ( g_plugins[i].lhandle != NULL ) {
-   if ( g_plugins[i].sched != NULL )
-    if ( g_plugins[i].sched->free != NULL )
-     g_plugins[i].sched->free();
-
-   roar_dl_close(g_plugins[i].lhandle);
+   plugins_delete(&(g_plugins[i]));
   }
  }
@@ -105 +124 @@
 }
 
-int plugins_load  (const char * filename) {
+int plugins_load  (const char * filename, const char * args) {
  struct _roard_plugin * next = _find_free();
+ struct roar_dl_librarypara * para;
+ int i;
 
  if ( next == NULL )
   return -1;
 
- next->lhandle = roar_dl_open(filename, -1, 0 /* we delay this until plugins_init() */);
+ for (i = 0; i < MAX_PROTOS; i++)
+  next->protocols[i] = -1;
+
+ if ( (para = roar_dl_para_new(args, NULL, ROARD_DL_APPNAME, ROARD_DL_ABIVERSION)) == NULL ) {
+  ROAR_WARN("Can not load plugin (allocate para set): %s: %s", filename, roar_error2str(roar_error));
+  return -1;
+ }
+
+ next->lhandle = roar_dl_open(filename, ROAR_DL_FLAG_DEFAUTS, 0 /* we delay this until plugins_init() */, para);
+ roar_dl_para_unref(para);
+
  if ( next->lhandle == NULL ) {
   ROAR_ERR("plugins_load(filename='%s'): can not load plugin: %s", filename, roar_dl_errstr(NULL));
@@ -130 +161 @@
 
 int plugins_reg_proto(struct roard_proto         * proto) {
+ int i;
+
  if ( _pp == NULL )
   return -1;
+
+ for (i = 0; i < MAX_PROTOS; i++) {
+  if ( _pp->protocols[i] == -1 ) {
+   _pp->protocols[i] = proto->proto;
+   break;
+  }
+ }
+
+ if ( i == MAX_PROTOS ) {
+  roar_err_set(ROAR_ERROR_NOMEM);
+  return -1;
+ }
 
  return clients_register_proto(proto);