Changeset 5275:811818eb5b81 in roaraudio for roard

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Improved plugin loader a lot (Closes: #190)

Location:

roard

Files:

• clients.c (modified) (3 diffs)
• include/client.h (modified) (2 diffs)
• include/plugins.h (modified) (4 diffs)
• plugins.c (modified) (6 diffs)
• roard.c (modified) (5 diffs)

roard/clients.c

@@ -38 +38 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
 #ifdef ROAR_HAVE_H_ESD
- {ROAR_PROTO_ESOUND, NULL, emul_esd_check_client, NULL, NULL},
+ {ROAR_PROTO_ESOUND, ROAR_SUBSYS_WAVEFORM, "EsounD emulation", NULL, emul_esd_check_client, NULL, NULL},
 #endif
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- {ROAR_PROTO_RPLAY, NULL, emul_rplay_check_client, NULL, NULL},
+ {ROAR_PROTO_RPLAY, ROAR_SUBSYS_WAVEFORM, "RPlay emulation", NULL, emul_rplay_check_client, NULL, NULL},
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- {ROAR_PROTO_GOPHER, NULL, emul_gopher_check_client, NULL, emul_gopher_flushed_client},
-#endif
- {-1, NULL}
+ {ROAR_PROTO_GOPHER, ROAR_SUBSYS_WAVEFORM, "The Internet Gopher Protocol", NULL, emul_gopher_check_client, NULL, emul_gopher_flushed_client},
+#endif
+ {-1, 0, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -58 +58 @@
  for (i = 0; i < ROAR_CLIENTS_MAX; i++)
   g_clients[i] = NULL;
+
+ for (i = 0; g_proto[i].proto != -1; i++);
+
+ for (; i < MAX_PROTOS; i++)
+  g_proto[i].proto = -1;
 
  return 0;
@@ -826 +831 @@
  memcpy(&(g_proto[i]), proto, sizeof(*g_proto));
 
- i++;
-
- memset(&(g_proto[i]), 0, sizeof(*g_proto));
- g_proto[i].proto = -1;
-
- return 0;
-}
-
+ return 0;
+}
+
+int clients_unregister_proto(int proto) {
+ const size_t len = sizeof(g_proto)/sizeof(*g_proto);
+ size_t i;
+
+ if ( proto < 0 ) {
+  roar_err_set(ROAR_ERROR_RANGE);
+  return -1;
+ }
+
+ for (i = 0; i < len; i++) {
+  if ( g_proto[i].proto == proto ) {
+   memset(&(g_proto[i]), 0, sizeof(*g_proto));
+   g_proto[i].proto = -1;
+   return 0;
+  }
+ }
+
+ roar_err_set(ROAR_ERROR_NOENT);
+ return -1;
+}
+
+void print_protolist        (enum output_format format) {
+ const size_t len = sizeof(g_proto)/sizeof(*g_proto);
+ struct roard_proto * p;
+ char subsys[7] = "      ";
+ size_t i;
+
+ switch (format) {
+  case FORMAT_NATIVE:
+    printf("  Protocol Flag Subsys - Description\n");
+    printf("------------------------------------------------------\n");
+    printf("  roar          WM LRX - RoarAudio native protocol\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("  simple        WM LRX - PulseAudio simple protocol\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("  rsound        W      - RSound emulation\n");
+#endif
+   break;
+  case FORMAT_WIKI:
+    printf("||=Protocol =||=Flag =||=Subsys =||=Description              =||\n");
+    printf("||roar       ||       ||WM LRX   ||RoarAudio native protocol  ||\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("||simple     ||       ||WM LRX   ||PulseAudio simple protocol ||\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("||rsound     ||       ||W        ||RSound emulation           ||\n");
+#endif
+   break;
+  case FORMAT_CSV:
+    printf("Protocol,Flag,Subsys,Description\n");
+    printf("roar,,WM LRX,RoarAudio native protocol\n");
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
+    printf("simple,,WM LRX,PulseAudio simple protocol\n");
+#endif
+#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
+    printf("rsound,,W,RSound emulation\n");
+#endif
+   break;
+  default:
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return;
+ }
+
+ for (i = 0; i < len; i++) {
+  p = &(g_proto[i]);
+  if ( p->proto == -1 )
+   continue;
+
+  strncpy(subsys, "      ", 6);
+
+  if ( p->subsystems & ROAR_SUBSYS_WAVEFORM )
+   subsys[0] = 'W';
+  if ( p->subsystems & ROAR_SUBSYS_MIDI )
+   subsys[1] = 'M';
+  if ( p->subsystems & ROAR_SUBSYS_CB )
+   subsys[2] = 'C';
+  if ( p->subsystems & ROAR_SUBSYS_LIGHT )
+   subsys[3] = 'L';
+  if ( p->subsystems & ROAR_SUBSYS_RAW )
+   subsys[4] = 'R';
+  if ( p->subsystems & ROAR_SUBSYS_COMPLEX )
+   subsys[5] = 'X';
+
+  switch (format) {
+   case FORMAT_NATIVE:
+     printf("  %-13s %s - %s\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+   case FORMAT_WIKI:
+     printf("||%s || ||%s ||%s ||\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+   case FORMAT_CSV:
+     printf("%s,,%s,%s\n", roar_proto2str(p->proto), subsys, p->description);
+    break;
+  }
+ }
+}
 
 int client_stream_exec   (int client, int stream) {

roard/include/client.h

@@ -76 +76 @@
 struct roard_proto {
  int proto;
+ int subsystems;
+ const char * description;
  int (*new_client)(int client, struct roar_vio_calls * vio, struct roard_listen * lsock);
  int (*check_client)(int client, struct roar_vio_calls * vio);
@@ -114 +116 @@
 
 // proto support
-int clients_register_proto(struct roard_proto * proto);
+int clients_register_proto  (struct roard_proto * proto);
+int clients_unregister_proto(int proto);
+void print_protolist        (enum output_format format);
 
 // stream functions

roard/include/plugins.h

@@ -29 +29 @@
 #include <roaraudio.h>
 
+#define ROARD_DL_APPNAME    "roard <0/RoarAudio>"
+#define ROARD_DL_ABIVERSION NULL
+
 struct roard_plugins_sched {
  int (*init)(void);
@@ -40 +43 @@
 int plugins_update   (void);
 
-int plugins_load     (const char * filename);
+int plugins_load     (const char * filename, const char * args);
 
 int plugins_reg_sched(struct roard_plugins_sched * sched);
@@ -62 +65 @@
  ROARD_DL_REG__UNI_POST
 
+// Register Scheduler callbacks:
 #define ROARD_DL_REGFN_SCHED() ROAR_DL_PLUGIN_REG(ROAR_DL_FN_ROARDSCHED, __reg_sched)
 
@@ -70 +74 @@
  ROARD_DL_REG__UNI_POST
 
+// Register Protocol callbacks:
 #define ROARD_DL_REGFN_PROTO() ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto)
+
+// Check version:
+#define ROARD_DL_CHECK_VERSIONS() ROAR_DL_PLUGIN_CHECK_VERSIONS(ROARD_DL_APPNAME, ROARD_DL_ABIVERSION)
 
 #endif

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);

roard/roard.c

@@ -260 +260 @@
  printf(
         " --plugin-load FILE    - Load plugin FILE\n"
+        " --plugin-args ARGS    - Arguments for the plugin\n"
+        "                         (must be given before the --plugin-load)\n"
        );
 
@@ -417 +419 @@
 // printf("\n Options:\n\n");
  printf("\n");
-}
-
-static void list_proto (void) {
- printf("  Protocol Flag Subsys - Description\n");
- printf("------------------------------------------------------\n");
- printf("  roar          WM LRX - RoarAudio native protocol\n");
-#if !defined(ROAR_WITHOUT_DCOMP_EMUL_ESD) && defined(ROAR_HAVE_H_ESD)
- printf("  esd           W      - EsounD emulation\n");
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_SIMPLE
- printf("  simple        WM LRX - PulseAudio simple protocol\n");
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RSOUND
- printf("  rsound        W      - RSound emulation\n");
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- printf("  rplay         W      - RPlay emulation\n");
-#endif
-#ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- printf("  gopher               - The Internet Gopher Protocol\n");
-#endif
 }
 
@@ -1380 +1361 @@
  int    sysclocksync = 0;
 // char * server = ROAR_DEFAULT_SOCK_GLOBAL;
+ const char * plugin_args = NULL;
 #ifdef ROAR_SUPPORT_LISTEN
  int    port       = ROAR_DEFAULT_PORT;
@@ -1701 +1683 @@
   } else if ( strcmp(k, "--plugin-load") == 0 ) {
    _CKHAVEARGS(1);
-   if ( plugins_load(argv[++i]) == -1 ) {
+   if ( plugins_load(argv[++i], plugin_args) == -1 ) {
     ROAR_ERR("Can not load plugin");
    }
+   plugin_args = NULL;
+  } else if ( strcmp(k, "--plugin-args") == 0 ) {
+   _CKHAVEARGS(1);
+   plugin_args = argv[++i];
 
   } else if ( strcmp(k, "--guest-acclev") == 0 ) {
@@ -2140 +2126 @@
 
   } else if ( strcmp(k, "--list-proto") == 0 ) {
-   list_proto();
+   print_protolist(print_format);
    return 0;