Changeset 5344:1fc66ca81759 in roaraudio

Timestamp:

12/10/11 00:08:10 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support lazy binding

Files:

• include/libroar/roardl.h (modified) (1 diff)
• libroar/roardl.c (modified) (2 diffs)
• roarclients/roarpluginrunner.c (modified) (1 diff)

include/libroar/roardl.h

@@ -42 +42 @@
 #define ROAR_DL_FLAG_NONE               0x0000
 #define ROAR_DL_FLAG_STATIC             0x0001 /* plugins are linked statically -lfoo */
+#define ROAR_DL_FLAG_LAZY               0x0002
 
 #define ROAR_DL_HANDLE_DEFAULT          ((struct roar_dl_lhandle*)(void*)0)

libroar/roardl.c

@@ -196 +196 @@
 #if defined(ROAR_HAVE_LIBDL)
 #ifdef RTLD_DEEPBIND
- int libdl_flags = RTLD_NOW|RTLD_DEEPBIND;
+ int libdl_flags = RTLD_DEEPBIND;
 #else
- int libdl_flags = RTLD_NOW;
+ int libdl_flags = 0;
 #endif
 #endif
@@ -205 +205 @@
  if ( flags == ROAR_DL_FLAG_DEFAULTS )
   flags = ROAR_DL_FLAG_NONE;
+
+#if defined(ROAR_HAVE_LIBDL)
+ if ( flags & ROAR_DL_FLAG_LAZY ) {
+  libdl_flags |= RTLD_LAZY;
+ } else {
+  libdl_flags |= RTLD_NOW;
+ }
+#endif
 
  if ( (ret = roar_mm_malloc(sizeof(struct roar_dl_lhandle))) == NULL )

roarclients/roarpluginrunner.c

@@ -91 +91 @@
 
 static int do_explain(const char * name) {
- struct roar_dl_lhandle * lhandle = roar_dl_open(name, ROAR_DL_FLAG_DEFAULTS, 0, NULL);
+ struct roar_dl_lhandle * lhandle = roar_dl_open(name, ROAR_DL_FLAG_LAZY, 0, NULL);
  struct roar_dl_libraryinst * (*func)(struct roar_dl_librarypara * para);
  struct roar_dl_libraryinst * lib;