Changeset 5312:27ec111dc8c5 in roaraudio

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.

Files:

• include/libroar/error.h (modified) (1 diff)
• include/libroar/roardl.h (modified) (3 diffs)
• libroar/error.c (modified) (1 diff)
• libroar/roardl.c (modified) (7 diffs)
• plugins/roard/protocol-irc.c (modified) (1 diff)
• plugins/universal/protocol-daytime.c (modified) (1 diff)
• plugins/universal/protocol-discard.c (modified) (1 diff)
• plugins/universal/protocol-echo.c (modified) (1 diff)
• roard/clients.c (modified) (6 diffs)
• roard/include/client.h (modified) (2 diffs)
• roard/plugins.c (modified) (4 diffs)

include/libroar/error.h

@@ -113 +113 @@
 void   roar_err_to_errno(void);
 
+// Resets the stored state to 'no error' state. This can be used
+// to init the state.
+int    roar_err_initstore(struct roar_error_state * state);
+
 // store a error state (both libroar and system)
 // returnes the error or ROAR_ERROR_NONE on success so it does not alter gloabl error state.

include/libroar/roardl.h

@@ -148 +148 @@
  int    (*func[ROAR_DL_FN_MAX])(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib);
  struct roar_dl_libraryname * libname;
+ size_t  global_data_len;
+ void *  global_data_init;
+ void ** global_data_pointer;
 };
 
+// parameter functions:
 struct roar_dl_librarypara * roar_dl_para_new(const char * args, void * binargv,
                                               const char * appname, const char * abiversion);
@@ -157 +161 @@
                                          const char * appname, const char * abiversion);
 
+// 'core' dynamic loader functions.
 struct roar_dl_lhandle * roar_dl_open   (const char * filename, int flags,
                                          int ra_init, struct roar_dl_librarypara * para);
@@ -169 +174 @@
 const char *             roar_dl_errstr (struct roar_dl_lhandle * lhandle);
 
+// getting meta data:
 struct roar_dl_librarypara       * roar_dl_getpara(struct roar_dl_lhandle * lhandle);
 const struct roar_dl_libraryname * roar_dl_getlibname(struct roar_dl_lhandle * lhandle);
+
+// context switching:
+// _restore() is to switch from main to library context. _store() is to store library context
+// and switch back to main context.
+int                      roar_dl_context_restore(struct roar_dl_lhandle * lhandle);
+int                      roar_dl_context_store(struct roar_dl_lhandle * lhandle);
 
 #endif

libroar/error.c

@@ -866 +866 @@
 }
 
+// Resets the stored state to 'no error' state. This can be used
+// to init the state.
+int    roar_err_initstore(struct roar_error_state * state) {
+ struct roar_error_state curstate;
+
+ if ( state == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ roar_err_store(&curstate);
+ roar_err_clear_all();
+ roar_err_store(state);
+ roar_err_restore(&curstate);
+
+ return -1;
+}
 
 // store a error state (both libroar and system)

libroar/roardl.c

@@ -43 +43 @@
  struct roar_dl_librarypara * para;
  struct roar_dl_libraryinst * lib;
+ struct {
+  struct roar_error_state error_state;
+  void *  global_data;
+  void *  global_data_state;
+ } context;
 #if defined(ROAR_HAVE_LIBDL)
  void * handle;
@@ -187 +192 @@
  memset(ret, 0, sizeof(struct roar_dl_lhandle));
 
+ roar_err_initstore(&(ret->context.error_state));
+
 #if defined(ROAR_HAVE_LIBDL)
  flags  = RTLD_NOW;
@@ -243 +250 @@
  ret = -1;
 #endif
+
+ if ( lhandle->context.global_data != NULL )
+  roar_mm_free(lhandle->context.global_data);
 
  if ( lhandle->para != NULL )
@@ -273 +283 @@
  struct roar_dl_libraryinst * (*func)(struct roar_dl_librarypara * para);
  struct roar_dl_libraryinst * lib;
+ void * global_data_state = NULL;
  int i;
 
@@ -310 +321 @@
  if ( !((void*)lhandle < (void*)128) ) {
   lhandle->lib = lib;
+
+  if ( lib->global_data_len ) {
+   lhandle->context.global_data = roar_mm_malloc(lib->global_data_len);
+   if ( lhandle->context.global_data == NULL )
+    return -1;
+
+   if ( lib->global_data_init == NULL ) {
+    memset(lhandle->context.global_data, 0, lib->global_data_len);
+   } else {
+    memcpy(lhandle->context.global_data, lib->global_data_init, lib->global_data_len);
+   }
+  }
+ }
+
+ if ( lib->global_data_pointer != NULL ) {
+  global_data_state = *(lib->global_data_pointer);
+  if ( !((void*)lhandle < (void*)128) ) {
+   *(lib->global_data_pointer) = lib->global_data_init;
+  } else {
+   *(lib->global_data_pointer) = lhandle->context.global_data;
+  }
  }
 
@@ -315 +347 @@
   if ( lib->func[i] != NULL )
    lib->func[i](para, lib);
+ }
+
+ if ( lib->global_data_pointer != NULL ) {
+  *(lib->global_data_pointer) = global_data_state;
  }
 
@@ -375 +411 @@
 }
 
+int                      roar_dl_context_restore(struct roar_dl_lhandle * lhandle) {
+ struct roar_error_state error_state;
+
+ if ( (void*)lhandle < (void*)128 ) {
+  roar_err_set(ROAR_ERROR_NOTSUP);
+  return -1;
+ }
+
+ roar_err_store(&error_state);
+ roar_err_restore(&(lhandle->context.error_state));
+ lhandle->context.error_state = error_state;
+
+ if ( lhandle->lib->global_data_pointer != NULL ) {
+  lhandle->context.global_data_state = *(lhandle->lib->global_data_pointer);
+  *(lhandle->lib->global_data_pointer) = lhandle->context.global_data;
+ }
+
+ return 0;
+}
+
+int                      roar_dl_context_store(struct roar_dl_lhandle * lhandle) {
+ struct roar_error_state error_state;
+
+ if ( (void*)lhandle < (void*)128 ) {
+  roar_err_set(ROAR_ERROR_NOTSUP);
+  return -1;
+ }
+
+ if ( lhandle->lib->global_data_pointer != NULL ) {
+  *(lhandle->lib->global_data_pointer) = lhandle->context.global_data_state;
+ }
+
+ roar_err_store(&error_state);
+ roar_err_restore(&(lhandle->context.error_state));
+ lhandle->context.error_state = error_state;
+
+ return 0;
+}
+
 //ll

plugins/roard/protocol-irc.c

@@ -865 +865 @@
 
 static struct roard_proto proto[1] = {
- {ROAR_PROTO_IRC, ROAR_SUBSYS_NONE, "Internet Relay Chat", new_client, check_client, NULL, NULL}
+ {ROAR_PROTO_IRC, ROAR_SUBSYS_NONE, "Internet Relay Chat", NULL, new_client, check_client, NULL, NULL}
 };
 

plugins/universal/protocol-daytime.c

@@ -59 +59 @@
 
 static struct roard_proto proto[1] = {
- {ROAR_PROTO_DAYTIME, ROAR_SUBSYS_NONE, "The Internet daytime protocol", new_client, NULL, NULL, flushed_client}
+ {ROAR_PROTO_DAYTIME, ROAR_SUBSYS_NONE, "The Internet daytime protocol", NULL, new_client, NULL, NULL, flushed_client}
 };
 

plugins/universal/protocol-discard.c

@@ -42 +42 @@
 
 static struct roard_proto proto[1] = {
- {ROAR_PROTO_DISCARD, ROAR_SUBSYS_NONE, "Discard all data send to the server", NULL, check_client, NULL, NULL}
+ {ROAR_PROTO_DISCARD, ROAR_SUBSYS_NONE, "Discard all data send to the server", NULL, NULL, check_client, NULL, NULL}
 };
 

plugins/universal/protocol-echo.c

@@ -57 +57 @@
 
 static struct roard_proto proto[1] = {
- {ROAR_PROTO_ECHO, ROAR_SUBSYS_NONE, "Send all data send to the server back to the client", NULL, check_client, NULL, NULL}
+ {ROAR_PROTO_ECHO, ROAR_SUBSYS_NONE, "Send all data send to the server back to the client", NULL, NULL, check_client, NULL, NULL}
 };
 

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