+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
+Fri Feb 20 02:39:03 2004 Tim Janik <timj@gtk.org>
+
+ * applied patch from David Schleef <ds@schleef.org> which implements
+ a G_MODULE_BIND_LOCAL flag to g_module_open() to disable global
+ symbol registration.
+
Thu Feb 19 18:40:01 2004 Tim Janik <timj@gtk.org>
* glib/gstring.[hc]: for G_CAN_INLINE environments, inline
</para>
@file_name: the name of the file containing the module.
-@flags: the flags used for opening the module. Currently this can be 0 or
-#G_MODULE_BIND_LAZY for lazy binding, where symbols are only bound when needed.
+@flags: the flags used for opening the module. This can be the logical
+OR of any of the #GModuleFlags.
@Returns: a #GModule on success, or %NULL on failure.
#G_MODULE_BIND_LAZY specifies that symbols are only resolved when needed.
The default action is to bind all symbols when the module is loaded.
(#G_MODULE_BIND_LAZY is not supported on all platforms.)
+#G_MODULE_BIND_LOCAL specifies that symbols in the module should
+not be added to the global name space. The default action on most
+platforms is to place symbols in the module in the global name space,
+which may cause conflicts with existing symbols.
+(#G_MODULE_BIND_LOCAL is not supported on all platforms.)
</para>
@G_MODULE_BIND_LAZY:
+@G_MODULE_BIND_LOCAL:
@G_MODULE_BIND_MASK:
<!-- ##### FUNCTION g_module_symbol ##### -->
* different image_id's. While this means that we don't have to worry about
* reference counts, it could lead to problems in the future....
* richard.
+ *
+ * load_add_on() apparently does not support lazy or local binding. Need
+ * to confirm that the actual behavior is non-lazy/local. --ds
*/
#include <Errors.h>
/* --- functions --- */
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
image_id handle;
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
gpointer handle;
- handle = dlopen (file_name, RTLD_GLOBAL | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
+ handle = dlopen (file_name,
+ (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
if (!handle)
g_module_set_error (fetch_dlerror (TRUE));
/* --- functions --- */
+
+/*
+ * shl_load() does not appear to support making symbols invisible to
+ * the global namespace. However, the default is to put the library
+ * last in the search order, which is approximately what we want,
+ * since it will cause symbols that conflict with existing symbols to
+ * be invisible. It is unclear if BIND_FIRST should be used when
+ * bind_local==0, since it may cause the loaded symbols to be used
+ * preferentially to the application's symbols, which is Almost
+ * Always Wrong. --ds
+ */
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
shl_t shl_handle;
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
NSObjectFileImage image;
NSObjectFileImageReturnCode ret;
return NULL;
}
- options = NSLINKMODULE_OPTION_RETURN_ON_ERROR | NSLINKMODULE_OPTION_PRIVATE;
+ options = NSLINKMODULE_OPTION_RETURN_ON_ERROR;
+ if (bind_local)
+ options |= NSLINKMODULE_OPTION_PRIVATE;
if (!bind_lazy)
options |= NSLINKMODULE_OPTION_BINDNOW;
module = NSLinkModule (image, file_name, options);
/* --- functions --- */
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
gpointer handle;
- handle = dlopen (file_name, RTLD_GLOBAL | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
+ handle = dlopen (file_name,
+ (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
if (!handle)
g_module_set_error (dlerror ());
/* --- functions --- */
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
HINSTANCE handle;
#ifdef G_WITH_CYGWIN
/* --- prototypes --- */
static gpointer _g_module_open (const gchar *file_name,
- gboolean bind_lazy);
+ gboolean bind_lazy,
+ gboolean bind_local);
static void _g_module_close (gpointer handle,
gboolean is_unref);
static gpointer _g_module_self (void);
"not supported by this system"); return rv; }
static gpointer
_g_module_open (const gchar *file_name,
- gboolean bind_lazy)
+ gboolean bind_lazy,
+ gboolean bind_local)
{
return NULL;
}
name = real_name;
}
if (name)
- handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0);
+ handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0,
+ (flags & G_MODULE_BIND_LOCAL) != 0);
}
else
g_module_set_error_unduped (g_strdup_printf ("unable to access file \"%s\"", file_name));
typedef enum
{
G_MODULE_BIND_LAZY = 1 << 0,
- G_MODULE_BIND_MASK = 0x01
+ G_MODULE_BIND_LOCAL = 1 << 1,
+ G_MODULE_BIND_MASK = 0x03
} GModuleFlags;
typedef struct _GModule GModule;