#include "wx/log.h"
#endif
-// only Mac OS X 10.3+ has dlfcn.h, and it is simpler to always provide our own
-// wrappers using the native functions instead of doing checks for OS version
-#ifndef __DARWIN__
+#ifdef HAVE_DLOPEN
#include <dlfcn.h>
#endif
+#ifdef __DARWIN__
+ #include <AvailabilityMacros.h>
+#endif
+
// if some flags are not supported, just ignore them
#ifndef RTLD_LAZY
#define RTLD_LAZY 0
// standard shared libraries extensions for different Unix versions
#if defined(__HPUX__)
- const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+ const wxString wxDynamicLibrary::ms_dllext(".sl");
#elif defined(__DARWIN__)
- const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
+ const wxString wxDynamicLibrary::ms_dllext(".bundle");
#else
- const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+ const wxString wxDynamicLibrary::ms_dllext(".so");
#endif
// ============================================================================
// ----------------------------------------------------------------------------
// dlxxx() emulation for Darwin
+// Only useful if the OS X version could be < 10.3 at runtime
// ----------------------------------------------------------------------------
-#if defined(__DARWIN__)
+#if defined(__DARWIN__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3)
// ---------------------------------------------------------------------------
// For Darwin/Mac OS X
// supply the sun style dlopen functions in terms of Darwin NS*
static char dl_last_error[1024];
-const char *dlerror()
+static const char *wx_darwin_dlerror()
{
return dl_last_error;
}
-void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
+static void *wx_darwin_dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
{
NSObjectFileImage ofile;
NSModule handle = NULL;
{
handle = NULL;
- static const char *errorStrings[] =
+ static const char *const errorStrings[] =
{
"%d: Object Image Load Failure",
"%d: Object Image Load Success",
return handle;
}
-int dlclose(void *handle)
+static int wx_darwin_dlclose(void *handle)
{
NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE);
return 0;
}
-void *dlsym(void *handle, const char *symbol)
+static void *wx_darwin_dlsym(void *handle, const char *symbol)
{
// as on many other systems, C symbols have prepended underscores under
// Darwin but unlike the normal dlopen(), NSLookupSymbolInModule() is not
return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
}
+// Add the weak linking attribute to dlopen's declaration
+extern void * dlopen(const char * __path, int __mode) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER;
+
+// For all of these methods we test dlopen since all of the dl functions we use were added
+// to OS X at the same time. This also ensures we don't dlopen with the real function then
+// dlclose with the internal implementation.
+
+static inline void *wx_dlopen(const char *__path, int __mode)
+{
+#ifdef HAVE_DLOPEN
+ if(&dlopen != NULL)
+ return dlopen(__path, __mode);
+ else
+#endif
+ return wx_darwin_dlopen(__path, __mode);
+}
+
+static inline int wx_dlclose(void *__handle)
+{
+#ifdef HAVE_DLOPEN
+ if(&dlopen != NULL)
+ return dlclose(__handle);
+ else
+#endif
+ return wx_darwin_dlclose(__handle);
+}
+
+static inline const char *wx_dlerror()
+{
+#ifdef HAVE_DLOPEN
+ if(&dlopen != NULL)
+ return dlerror();
+ else
+#endif
+ return wx_darwin_dlerror();
+}
+
+static inline void *wx_dlsym(void *__handle, const char *__symbol)
+{
+#ifdef HAVE_DLOPEN
+ if(&dlopen != NULL)
+ return dlsym(__handle, __symbol);
+ else
+#endif
+ return wx_darwin_dlsym(__handle, __symbol);
+}
+
+#else // __DARWIN__/!__DARWIN__
+
+// Use preprocessor definitions for non-Darwin or OS X >= 10.3
+#define wx_dlopen(__path,__mode) dlopen(__path,__mode)
+#define wx_dlclose(__handle) dlclose(__handle)
+#define wx_dlerror() dlerror()
+#define wx_dlsym(__handle,__symbol) dlsym(__handle,__symbol)
+
#endif // defined(__DARWIN__)
// ----------------------------------------------------------------------------
wxDllType wxDynamicLibrary::GetProgramHandle()
{
#ifdef USE_POSIX_DL_FUNCS
- return dlopen(0, RTLD_LAZY);
+ return wx_dlopen(0, RTLD_LAZY);
#else
return PROG_HANDLE;
#endif
wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
{
wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY),
- _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
+ wxT("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
#ifdef USE_POSIX_DL_FUNCS
// we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen()
if ( flags & wxDL_GLOBAL )
rtldFlags |= RTLD_GLOBAL;
- return dlopen(libname.fn_str(), rtldFlags);
+ return wx_dlopen(libname.fn_str(), rtldFlags);
#else // !USE_POSIX_DL_FUNCS
int shlFlags = 0;
#endif
#ifdef USE_POSIX_DL_FUNCS
- dlclose(handle);
+ wx_dlclose(handle);
#else // !USE_POSIX_DL_FUNCS
shl_unload(handle);
#endif // USE_POSIX_DL_FUNCS/!USE_POSIX_DL_FUNCS
void *symbol;
#ifdef USE_POSIX_DL_FUNCS
- symbol = dlsym(handle, name.fn_str());
+ symbol = wx_dlsym(handle, name.fn_str());
#else // !USE_POSIX_DL_FUNCS
// note that shl_findsym modifies the handle argument to indicate where the
// symbol was found, but it's ok to modify the local handle copy here
/* static */
void wxDynamicLibrary::Error()
{
-#if wxUSE_UNICODE
- wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
- const wxChar *err = buffer;
-#else
- const wxChar *err = dlerror();
-#endif
+ wxString err(wx_dlerror());
+
+ if ( err.empty() )
+ err = _("Unknown dynamic library error");
- wxLogError(wxT("%s"), err ? err : _("Unknown dynamic library error"));
+ wxLogError(wxT("%s"), err);
}
#endif // wxHAVE_DYNLIB_ERROR
public:
// create a new wxDynamicLibraryDetails from the given data
static wxDynamicLibraryDetails *
- New(unsigned long start, unsigned long end, const wxString& path)
+ New(void *start, void *end, const wxString& path)
{
wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
details->m_path = path;
- details->m_name = path.AfterLast(_T('/'));
- details->m_address = wxUIntToPtr(start);
- details->m_length = end - start;
+ details->m_name = path.AfterLast(wxT('/'));
+ details->m_address = start;
+ details->m_length = (char *)end - (char *)start;
// try to extract the library version from its name
- const size_t posExt = path.rfind(_T(".so"));
+ const size_t posExt = path.rfind(wxT(".so"));
if ( posExt != wxString::npos )
{
- if ( path.c_str()[posExt + 3] == _T('.') )
+ if ( path.c_str()[posExt + 3] == wxT('.') )
{
// assume "libfoo.so.x.y.z" case
details->m_version.assign(path, posExt + 4, wxString::npos);
}
else
{
- size_t posDash = path.find_last_of(_T('-'), posExt);
+ size_t posDash = path.find_last_of(wxT('-'), posExt);
if ( posDash != wxString::npos )
{
// assume "libbar-x.y.z.so" case
#ifdef __LINUX__
// examine /proc/self/maps to find out what is loaded in our address space
- wxFFile file(_T("/proc/self/maps"));
+ wxFFile file(wxT("/proc/self/maps"));
if ( file.IsOpened() )
{
// details of the module currently being parsed
wxString pathCur;
- unsigned long startCur = 0,
- endCur = 0;
+ void *startCur = NULL,
+ *endCur = NULL;
char path[1024];
char buf[1024];
while ( fgets(buf, WXSIZEOF(buf), file.fp()) )
{
- // format is: start-end perm something? maj:min inode path
- unsigned long start, end;
- switch ( sscanf(buf, "%08lx-%08lx %*4s %*08x %*02x:%*02x %*d %1024s\n",
+ // format is: "start-end perm offset maj:min inode path", see proc(5)
+ void *start,
+ *end;
+ switch ( sscanf(buf, "%p-%p %*4s %*p %*02x:%*02x %*d %1024s\n",
&start, &end, path) )
{
case 2:
default:
// chop '\n'
buf[strlen(buf) - 1] = '\0';
- wxLogDebug(_T("Failed to parse line \"%s\" in /proc/self/maps."),
+ wxLogDebug(wxT("Failed to parse line \"%s\" in /proc/self/maps."),
buf);
continue;
}
+ wxASSERT_MSG( start >= endCur,
+ wxT("overlapping regions in /proc/self/maps?") );
+
wxString pathNew = wxString::FromAscii(path);
if ( pathCur.empty() )
{
startCur = start;
endCur = end;
}
- else if ( pathCur == pathNew )
+ else if ( pathCur == pathNew && endCur == end )
{
- // continuation of the same module
- wxASSERT_MSG( start == endCur, _T("hole in /proc/self/maps?") );
+ // continuation of the same module in the address space
endCur = end;
}
else // end of the current module
projects / wxWidgets.git / blobdiff