Changeset 5834:22e75d31bfd8 in roaraudio

Timestamp:

01/06/13 19:56:21 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fix #296 by using a workaround (disabling RTLD_DEEPBIND). Needs to be fully fixed next release. (See #296)

Files:

• ChangeLog (modified) (1 diff)
• libroar/roardl.c (modified) (8 diffs)
• libroar/vio.c (modified) (2 diffs)
• libroar/vio_stdvios.c (modified) (3 diffs)

ChangeLog

@@ -6 +6 @@
         * Made build system tests return correct error codes.
         * Improved CSI: Make it easier to register and access services.
+        * Allow seperation of plugin's stdvios (See: #296)
 
 v. 1.0beta8 - Mon Dec 10 2012 12:42 CET

libroar/roardl.c

@@ -59 +59 @@
   void *  global_data_state;
   struct roar_notify_core * notifycore;
+  struct roar_vio_calls * stdvios[3];
  } context;
  unsigned int runtime_flags;
@@ -357 +358 @@
  struct roar_dl_lhandle * ret = NULL;
 #if defined(ROAR_HAVE_H_DLFCN)
-#ifdef RTLD_DEEPBIND
+#if defined(RTLD_DEEPBIND) && 0
+ // FIXME: this is current disabled. See #296.
  int libdl_flags = RTLD_DEEPBIND;
 #else
@@ -421 +423 @@
 
  ret->para = para;
+
+ if ( roar_vio_ref(roar_stdin) == 0 )
+  ret->context.stdvios[0] = roar_stdin;
+ if ( roar_vio_ref(roar_stdout) == 0 )
+  ret->context.stdvios[1] = roar_stdout;
+ if ( roar_vio_ref(roar_stderr) == 0 )
+  ret->context.stdvios[2] = roar_stderr; 
 
  if ( ra_init ) {
@@ -433 +442 @@
     FreeLibrary(ret->handle);
 #endif
+   roar_vio_unref(ret->context.stdvios[0]);
+   roar_vio_unref(ret->context.stdvios[1]);
+   roar_vio_unref(ret->context.stdvios[2]);
    roar_mm_free(ret);
    roar_error = err;
@@ -501 +513 @@
  ret = -1;
 #endif
+
+ roar_vio_unref(lhandle->context.stdvios[0]);
+ roar_vio_unref(lhandle->context.stdvios[1]);
+ roar_vio_unref(lhandle->context.stdvios[2]);
 
  if ( lhandle->context.global_data != NULL )
@@ -726 +742 @@
 }
 
+static inline void __swap_stdvios(struct roar_dl_lhandle * lhandle) {
+ struct roar_vio_calls * vio;
+
+ vio = roar_stdin;
+ roar_stdin = lhandle->context.stdvios[0];
+ lhandle->context.stdvios[0] = vio;
+ vio = roar_stdout;
+ roar_stdout = lhandle->context.stdvios[1];
+ lhandle->context.stdvios[1] = vio;
+ vio = roar_stderr;
+ roar_stderr = lhandle->context.stdvios[2];
+ lhandle->context.stdvios[2] = vio;
+}
+
 int                      roar_dl_context_restore(struct roar_dl_lhandle * lhandle) {
  struct roar_error_state error_state;
@@ -740 +770 @@
  roar_err_restore(&(lhandle->context.error_state));
  lhandle->context.error_state = error_state;
+
+ __swap_stdvios(lhandle);
 
  if ( lhandle->lib->global_data_pointer != NULL ) {
@@ -777 +809 @@
   *(lhandle->lib->global_data_pointer) = lhandle->context.global_data_state;
  }
+
+ __swap_stdvios(lhandle);
 
  roar_err_store(&error_state);

libroar/vio.c

@@ -218 +218 @@
 int     roar_vio_unref    (struct roar_vio_calls * vio) {
  int ret;
+ int err;
 
  ROAR_DBG("roar_vio_unref(vio=%p) = ?", vio);
@@ -240 +241 @@
  roar_err_update();
 
- if ( vio->flags & ROAR_VIO_FLAGS_FREESELF )
+ err = roar_error;
+
+ if ( vio->flags & ROAR_VIO_FLAGS_FREESELF ) {
+  roar_vio_clear_calls(vio);
   roar_mm_free(vio);
-
+ } else {
+  roar_vio_clear_calls(vio);
+ }
+
+ roar_error = err;
  return ret;
 }

libroar/vio_stdvios.c

@@ -39 +39 @@
  { .inst     = (void*)(ROAR_INSTINT)(ROAR_STDIN  + 1),
    .flags    = 0x00000000,
-   .refc     = 0,
+   .refc     = 1,
    .read     = roar_vio_basic_read,
    .write    = roar_vio_basic_write,
@@ -49 +49 @@
  { .inst     = (void*)(ROAR_INSTINT)(ROAR_STDOUT + 1),
    .flags    = 0x00000000,
-   .refc     = 0,
+   .refc     = 1,
    .read     = roar_vio_basic_read,
    .write    = roar_vio_basic_write,
@@ -59 +59 @@
  { .inst     = (void*)(ROAR_INSTINT)(ROAR_STDERR + 1),
    .flags    = 0x00000000,
-   .refc     = 0,
+   .refc     = 1,
    .read     = roar_vio_basic_read,
    .write    = roar_vio_basic_write,