Changeset 5312:27ec111dc8c5 in roaraudio for roard

Timestamp:

11/30/11 01:05:41 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for seperate contextes for roardl/plugins. Currently incudes error state and a global per handle data segment. This does not work for statically linked librarys (yet). support for per-context notify core needs to be added/completed.

Location:

roard

Files:

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

roard/clients.c

@@ -38 +38 @@
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_ESD
 #ifdef ROAR_HAVE_H_ESD
- {ROAR_PROTO_ESOUND, ROAR_SUBSYS_WAVEFORM, "EsounD emulation", NULL, emul_esd_check_client, NULL, NULL},
+ {ROAR_PROTO_ESOUND, ROAR_SUBSYS_WAVEFORM, "EsounD emulation", NULL, NULL, emul_esd_check_client, NULL, NULL},
 #endif
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_RPLAY
- {ROAR_PROTO_RPLAY, ROAR_SUBSYS_WAVEFORM, "RPlay emulation", NULL, emul_rplay_check_client, NULL, NULL},
+ {ROAR_PROTO_RPLAY, ROAR_SUBSYS_WAVEFORM, "RPlay emulation", NULL, NULL, emul_rplay_check_client, NULL, NULL},
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_EMUL_GOPHER
- {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}
+ {ROAR_PROTO_GOPHER, ROAR_SUBSYS_WAVEFORM, "The Internet Gopher Protocol", NULL, NULL, emul_gopher_check_client, NULL, emul_gopher_flushed_client},
+#endif
+ {-1, 0, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -647 +647 @@
      if ( g_proto[i].proto == c->proto ) {
       roar_vio_open_fh_socket(&vio, clients_get_fh(id));
+      if ( g_proto[i].lhandle != NULL )
+       roar_dl_context_restore(g_proto[i].lhandle);
       rv = g_proto[i].check_client(id, &vio);
+      if ( g_proto[i].lhandle != NULL )
+       roar_dl_context_store(g_proto[i].lhandle);
      }
     }
@@ -686 +690 @@
 
  if ( p->flush_client != NULL ) {
+  if ( p->lhandle != NULL )
+   roar_dl_context_restore(p->lhandle);
   return p->flush_client(id, &vio);
+  if ( p->lhandle != NULL )
+   roar_dl_context_store(p->lhandle);
  }
 
@@ -716 +724 @@
  if ( cs->outbuf == NULL ) {
   if ( p->flushed_client != NULL ) {
+   if ( p->lhandle != NULL )
+    roar_dl_context_restore(p->lhandle);
    return p->flushed_client(id, &vio);
+   if ( p->lhandle != NULL )
+    roar_dl_context_store(p->lhandle);
   }
  }
@@ -813 +825 @@
 
 // proto support
-int clients_register_proto(struct roard_proto * proto) {
+int clients_register_proto(struct roard_proto * proto, struct roar_dl_lhandle * lhandle) {
  const size_t len = sizeof(g_proto)/sizeof(*g_proto);
  size_t i;
@@ -829 +841 @@
 
  memcpy(&(g_proto[i]), proto, sizeof(*g_proto));
+
+ g_proto[i].lhandle = lhandle;
 
  return 0;

roard/include/client.h

@@ -78 +78 @@
  int subsystems;
  const char * description;
+ struct roar_dl_lhandle * lhandle;
  int (*new_client)(int client, struct roar_vio_calls * vio, struct roard_listen * lsock);
  int (*check_client)(int client, struct roar_vio_calls * vio);
@@ -116 +117 @@
 
 // proto support
-int clients_register_proto  (struct roard_proto * proto);
+int clients_register_proto  (struct roard_proto * proto, struct roar_dl_lhandle * lhandle);
 int clients_unregister_proto(int proto);
 void print_protolist        (enum output_format format);

roard/plugins.c

@@ -57 +57 @@
  int i;
 
- if ( plugin->sched != NULL )
-  if ( plugin->sched->free != NULL )
+ if ( plugin->sched != NULL ) {
+  if ( plugin->sched->free != NULL ) {
+   roar_dl_context_restore(plugin->lhandle);
    plugin->sched->free();
+   roar_dl_context_store(plugin->lhandle);
+  }
+ }
 
  for (i = 0; i < MAX_PROTOS; i++) {
@@ -87 +91 @@
    }
 
-   if ( g_plugins[i].sched != NULL )
-    if ( g_plugins[i].sched->init != NULL )
+   if ( g_plugins[i].sched != NULL ) {
+    if ( g_plugins[i].sched->init != NULL ) {
+     roar_dl_context_restore(g_plugins[i].lhandle);
      g_plugins[i].sched->init();
+     roar_dl_context_store(g_plugins[i].lhandle);
+    }
+   }
 
    _pp = NULL;
@@ -114 +122 @@
  int i;
 
- for (i = 0; i < MAX_PLUGINS; i++)
-  if ( g_plugins[i].lhandle != NULL )
-   if ( g_plugins[i].sched != NULL )
-    if ( g_plugins[i].sched->update != NULL )
+ for (i = 0; i < MAX_PLUGINS; i++) {
+  if ( g_plugins[i].lhandle != NULL ) {
+   if ( g_plugins[i].sched != NULL ) {
+    if ( g_plugins[i].sched->update != NULL ) {
+     roar_dl_context_restore(g_plugins[i].lhandle);
      if ( g_plugins[i].sched->update() == -1 )
       ret = -1;
+     roar_dl_context_store(g_plugins[i].lhandle);
+    }
+   }
+  }
+ }
 
  return ret;
@@ -178 +192 @@
  }
 
- return clients_register_proto(proto);
+ return clients_register_proto(proto, _pp->lhandle);
 }