Changeset 5312:27ec111dc8c5 in roaraudio for libroar

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:

libroar

Files:

• error.c (modified) (1 diff)
• roardl.c (modified) (7 diffs)

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