Loading...
--- dyld/dyld-97.1/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-43.1/src/dyldAPIsInLibSystem.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -31,9 +31,6 @@
#include "dyldLock.h"
-extern "C" int __cxa_atexit(void (*func)(void *), void *arg, void *dso);
-
-
/*
* names_match() takes an install_name from an LC_LOAD_DYLIB command and a
* libraryName (which is -lx or -framework Foo argument passed to the static
@@ -90,7 +87,7 @@
void NSInstallLinkEditErrorHandlers(
const NSLinkEditErrorHandlers* handlers)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(
void (*undefined)(const char* symbol_name),
NSModule (*multiple)(NSSymbol s, NSModule old, NSModule newhandler),
@@ -106,7 +103,7 @@
NSNameOfModule(
NSModule module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
if(p == NULL)
@@ -118,7 +115,7 @@
NSLibraryNameForModule(
NSModule module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
if(p == NULL)
@@ -130,7 +127,7 @@
NSIsSymbolNameDefined(
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName) = NULL;
if(p == NULL)
@@ -143,7 +140,7 @@
const char* symbolName,
const char* libraryNameHint)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -157,7 +154,7 @@
const struct mach_header *image,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const struct mach_header *image,
const char* symbolName) = NULL;
@@ -170,7 +167,7 @@
NSLookupAndBindSymbol(
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName) = NULL;
if(p == NULL)
@@ -183,7 +180,7 @@
const char* symbolName,
const char* libraryNameHint)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -197,7 +194,7 @@
NSModule module,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(NSModule module, const char* symbolName) = NULL;
if(p == NULL)
@@ -211,7 +208,7 @@
const char* symbolName,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const struct mach_header *image,
const char* symbolName,
uint32_t options) = NULL;
@@ -225,7 +222,7 @@
NSNameOfSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static char * (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -237,7 +234,7 @@
NSAddressOfSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void * (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -249,7 +246,7 @@
NSModuleForSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSModule (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -261,7 +258,7 @@
NSAddLibrary(
const char* pathName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
if(p == NULL)
@@ -273,7 +270,7 @@
NSAddLibraryWithSearching(
const char* pathName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
if(p == NULL)
@@ -286,7 +283,7 @@
const char* image_name,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const char* image_name,
uint32_t options) = NULL;
@@ -314,30 +311,30 @@
struct load_command *load_commands, *lc;
struct dylib_command *dl;
char *install_name;
-#if __LP64__
- static struct mach_header_64 *mh = NULL;
-#else
+#ifndef __OPENSTEP__
static struct mach_header *mh = NULL;
-#endif
if(mh == NULL)
mh = _NSGetMachExecuteHeader();
+#else /* defined(__OPENSTEP__) */
+#ifdef __DYNAMIC__
+ static struct mach_header *mh = NULL;
+ if(mh == NULL)
+ _dyld_lookup_and_bind("__mh_execute_header", &mh, NULL);
+#else
+ struct mach_header *mh;
+ mh = (struct mach_header *)&_mh_execute_header;
+#endif
+#endif /* __OPENSTEP__ */
load_commands = (struct load_command *)
-#if __LP64__
- ((char *)mh + sizeof(struct mach_header_64));
-#else
- ((char *)mh + sizeof(struct mach_header));
-#endif
+ ((char *)mh + sizeof(struct mach_header));
lc = load_commands;
for(i = 0; i < mh->ncmds; i++){
- switch ( lc->cmd ) {
- case LC_LOAD_DYLIB:
- case LC_LOAD_WEAK_DYLIB:
- dl = (struct dylib_command *)lc;
- install_name = (char *)dl + dl->dylib.name.offset;
- if(names_match(install_name, libraryName) == TRUE)
- return(dl->dylib.current_version);
- break;
- }
+ if(lc->cmd == LC_LOAD_DYLIB){
+ dl = (struct dylib_command *)lc;
+ install_name = (char *)dl + dl->dylib.name.offset;
+ if(names_match(install_name, libraryName) == TRUE)
+ return(dl->dylib.current_version);
+ }
lc = (struct load_command *)((char *)lc + lc->cmdsize);
}
return(-1);
@@ -366,11 +363,7 @@
if(mh->filetype != MH_DYLIB)
continue;
load_commands = (struct load_command *)
-#if __LP64__
- ((char *)mh + sizeof(struct mach_header_64));
-#else
((char *)mh + sizeof(struct mach_header));
-#endif
lc = load_commands;
for(j = 0; j < mh->ncmds; j++){
if(lc->cmd == LC_ID_DYLIB){
@@ -397,7 +390,7 @@
const char* pathName,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const char*, NSObjectFileImage*) = NULL;
if(p == NULL)
@@ -419,7 +412,7 @@
size_t size,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const void*, size_t, NSObjectFileImage*) = NULL;
if(p == NULL)
@@ -427,7 +420,6 @@
return p(address, size, objectFileImage);
}
-#if OBSOLETE_DYLD_API
/*
* NSCreateCoreFileImageFromFile() creates an NSObjectFileImage for the
* specified core file name if the file is a correct Mach-O core file.
@@ -439,20 +431,19 @@
const char* pathName,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const char*, NSObjectFileImage*) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSCreateCoreFileImageFromFile", (void**)&p);
return p(pathName, objectFileImage);
}
-#endif
bool
NSDestroyObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -467,7 +458,7 @@
const char* moduleName,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSModule (*p)(NSObjectFileImage, const char*, unsigned long) = NULL;
if(p == NULL)
@@ -494,7 +485,7 @@
const char** sectionName, /* can be NULL */
unsigned long* sectionOffset) /* can be NULL */
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage, unsigned long, const char**, const char**, unsigned long*) = NULL;
if(p == NULL)
@@ -512,7 +503,7 @@
NSSymbolDefinitionCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -532,7 +523,7 @@
NSObjectFileImage objectFileImage,
uint32_t ordinal)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t) = NULL;
if(p == NULL)
@@ -549,7 +540,7 @@
NSSymbolReferenceCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -570,7 +561,7 @@
uint32_t ordinal,
bool *tentative_definition) /* can be NULL */
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t, bool*) = NULL;
if(p == NULL)
@@ -588,7 +579,7 @@
NSObjectFileImage objectFileImage,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage, const char*) = NULL;
if(p == NULL)
@@ -611,7 +602,7 @@
const char* sectionName,
unsigned long *size) /* can be NULL */
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void* (*p)(NSObjectFileImage, const char*, const char*, unsigned long*) = NULL;
if(p == NULL)
@@ -630,7 +621,7 @@
NSHasModInitObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -646,7 +637,7 @@
const char* *fileName,
const char* *errorString)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(NSLinkEditErrors *c,
int *errorNumber,
const char* *fileName,
@@ -663,7 +654,7 @@
NSModule module,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(NSModule module, uint32_t options) = NULL;
if(p == NULL)
@@ -672,7 +663,6 @@
return p(module, options);
}
-#if OBSOLETE_DYLD_API
NSModule
NSReplaceModule(
NSModule moduleToReplace,
@@ -681,7 +671,6 @@
{
return(NULL);
}
-#endif
/*
*_NSGetExecutablePath copies the path of the executable into the buffer and
@@ -697,7 +686,7 @@
char *buf,
uint32_t *bufsize)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static int (*p)(char *buf, uint32_t *bufsize) = NULL;
if(p == NULL)
@@ -711,7 +700,7 @@
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, void** , NSModule*) = NULL;
if(p == NULL)
@@ -726,7 +715,7 @@
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, const char*, void**, NSModule*) = NULL;
if(p == NULL)
@@ -734,21 +723,19 @@
p(symbol_name, library_name_hint, address, module);
}
-#if OBSOLETE_DYLD_API
void
_dyld_lookup_and_bind_objc(
const char* symbol_name,
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char* , void**, NSModule*) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_lookup_and_bind_objc", (void**)&p);
p(symbol_name, address, module);
}
-#endif
void
_dyld_lookup_and_bind_fully(
@@ -756,7 +743,7 @@
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, void**, NSModule*) = NULL;
if(p == NULL)
@@ -768,7 +755,7 @@
_dyld_bind_fully_image_containing_address(
const void* address)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const void*) = NULL;
if(p == NULL)
@@ -787,7 +774,7 @@
_dyld_register_func_for_add_image(
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
if(p == NULL)
@@ -804,7 +791,7 @@
_dyld_register_func_for_remove_image(
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
if(p == NULL)
@@ -812,7 +799,6 @@
p(func);
}
-#if OBSOLETE_DYLD_API
/*
* _dyld_register_func_for_link_module registers the specified function to be
* called when a module is bound into the program. When this function is first
@@ -823,7 +809,7 @@
_dyld_register_func_for_link_module(
void (*func)(NSModule module))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule module)) = NULL;
if(p == NULL)
@@ -839,7 +825,7 @@
_dyld_register_func_for_unlink_module(
void (*func)(NSModule module))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule module)) = NULL;
if(p == NULL)
@@ -855,7 +841,7 @@
_dyld_register_func_for_replace_module(
void (*func)(NSModule oldmodule, NSModule newmodule))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule oldmodule,
NSModule newmodule)) = NULL;
@@ -876,7 +862,7 @@
void **objc_module,
unsigned long *size)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void (*p)(NSModule module,
void **objc_module,
unsigned long *size) = NULL;
@@ -892,37 +878,45 @@
* to be bound.
*/
void
-_dyld_bind_objc_module(const void* objc_module)
-{
- DYLD_LOCK_THIS_BLOCK;
+_dyld_bind_objc_module(
+const void* objc_module)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static void (*p)(const void *objc_module) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_bind_objc_module", (void**)&p);
p(objc_module);
}
+
+
+#if __DYNAMIC__
+bool
+_dyld_present(
+void)
+{
+ // hmmm, this code is in libSystem.dylib, which is loaded by dyld...
+ return true;
+}
#endif
-bool
-_dyld_present(void)
-{
- // this function exists for compatiblity only
- return true;
-}
-
uint32_t
-_dyld_image_count(void)
+_dyld_image_count(
+void)
{
DYLD_NO_LOCK_THIS_BLOCK;
static unsigned long (*p)(void) = NULL;
+ if(_dyld_present() == 0)
+ return(0);
if(p == NULL)
_dyld_func_lookup("__dyld_image_count", (void**)&p);
return(p());
}
const struct mach_header *
-_dyld_get_image_header(uint32_t image_index)
+_dyld_get_image_header(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static struct mach_header * (*p)(uint32_t image_index) = NULL;
@@ -933,7 +927,8 @@
}
intptr_t
-_dyld_get_image_vmaddr_slide(uint32_t image_index)
+_dyld_get_image_vmaddr_slide(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static unsigned long (*p)(uint32_t image_index) = NULL;
@@ -944,7 +939,8 @@
}
const char*
-_dyld_get_image_name(uint32_t image_index)
+_dyld_get_image_name(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static const char* (*p)(uint32_t image_index) = NULL;
@@ -955,9 +951,10 @@
}
bool
-_dyld_image_containing_address(const void* address)
-{
- DYLD_LOCK_THIS_BLOCK;
+_dyld_image_containing_address(
+const void* address)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const void*) = NULL;
if(p == NULL)
@@ -969,7 +966,7 @@
_dyld_get_image_header_containing_address(
const void* address)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const void*) = NULL;
if(p == NULL)
@@ -980,7 +977,7 @@
void _dyld_moninit(
void (*monaddition)(char *lowpc, char *highpc))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void (*p)(void (*monaddition)(char *lowpc, char *highpc)) = NULL;
if(p == NULL)
@@ -988,9 +985,10 @@
p(monaddition);
}
-bool _dyld_launched_prebound(void)
-{
- DYLD_LOCK_THIS_BLOCK;
+bool _dyld_launched_prebound(
+void)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(void) = NULL;
if(p == NULL)
@@ -998,9 +996,10 @@
return(p());
}
-bool _dyld_all_twolevel_modules_prebound(void)
-{
- DYLD_LOCK_THIS_BLOCK;
+bool _dyld_all_twolevel_modules_prebound(
+void)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(void) = NULL;
if(p == NULL)
@@ -1014,14 +1013,11 @@
#include <pthread.h>
#include <stdlib.h>
#include <mach-o/dyld.h>
-#include <servers/bootstrap.h>
-#include "dyldLibSystemInterface.h"
-#include "dyld_shared_cache_user.h"
-
+#include "dyldLock.h"
+#include "dyldLibSystemThreadHelpers.h"
// pthread key used to access per-thread dlerror message
static pthread_key_t dlerrorPerThreadKey;
-static bool dlerrorPerThreadKeyInitialized = false;
// data kept per-thread
struct dlerrorPerThreadData
@@ -1033,13 +1029,6 @@
// function called by dyld to get buffer to store dlerror message
static char* getPerThreadBufferFor_dlerror(uint32_t sizeRequired)
{
- // ok to create key lazily because this function is called within dyld lock, so there is no race condition
- if (!dlerrorPerThreadKeyInitialized ) {
- // create key and tell pthread package to call free() on any data associated with key if thread dies
- pthread_key_create(&dlerrorPerThreadKey, &free);
- dlerrorPerThreadKeyInitialized = true;
- }
-
const int size = (sizeRequired < 256) ? 256 : sizeRequired;
dlerrorPerThreadData* data = (dlerrorPerThreadData*)pthread_getspecific(dlerrorPerThreadKey);
if ( data == NULL ) {
@@ -1060,77 +1049,37 @@
return data->message;
}
-
-
-static bool get_update_dyld_shared_cache_bootstrap_port(mach_port_t& mp)
-{
- static bool found = false;
- static mach_port_t port;
- if ( found ) {
- mp = port;
- return true;
- }
- if ( bootstrap_look_up(bootstrap_port, "com.apple.dyld", &port) == KERN_SUCCESS ) {
- found = true;
- mp = port;
- return true;
- }
- return false;
-}
-
-#if __ppc__
- #define CUR_ARCH CPU_TYPE_POWERPC
-#elif __ppc64__
- #define CUR_ARCH CPU_TYPE_POWERPC64
-#elif __i386__
- #define CUR_ARCH CPU_TYPE_I386
-#elif __x86_64__
- #define CUR_ARCH CPU_TYPE_X86_64
-#endif
-
-static void shared_cache_missing()
-{
- mach_port_t mp;
- if ( get_update_dyld_shared_cache_bootstrap_port(mp) )
- dyld_shared_cache_missing(mp, CUR_ARCH, 0);
-}
-
-static void shared_cache_out_of_date()
-{
- mach_port_t mp;
- if ( get_update_dyld_shared_cache_bootstrap_port(mp) )
- dyld_shared_cache_out_of_date(mp, CUR_ARCH, 0);
-}
-
-
-
// that table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 4, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
- &getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
- &shared_cache_missing, &shared_cache_out_of_date,
- NULL, NULL };
-
+static dyld::ThreadingHelpers sThreadHelpers = { 1, &lockForLazyBinding, &unlockForLazyBinding, &getPerThreadBufferFor_dlerror };
//
// during initialization of libSystem this routine will run
-// and call dyld, registering the helper functions.
+// and call dyld, registering the threading helpers.
//
-extern "C" void _dyld_initializer() __attribute__((visibility("hidden")));
-void _dyld_initializer()
-{
- DYLD_LOCK_INITIALIZER;
+//
+static int registerWithDyld()
+{
+ static void (*p)(dyld::ThreadingHelpers*) = NULL;
+
+ // create key and tell pthread package to call free() on any data associated with key if thread dies
+ pthread_key_create(&dlerrorPerThreadKey, &free);
- void (*p)(dyld::LibSystemHelpers*);
-
- _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
if(p != NULL)
- p(&sHelpers);
-}
+ p(&sThreadHelpers);
+
+ return 0;
+}
+
+// should be able to use __attribute__((constructor)) on registerWithDyld, but compiler has bug (3679135)
+// instead use initialization of global to force it to run.
+static int hack = registerWithDyld();
char* dlerror()
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static char* (*p)() = NULL;
if(p == NULL)
@@ -1140,7 +1089,7 @@
int dladdr(const void* addr, Dl_info* info)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static int (*p)(const void* , Dl_info*) = NULL;
if(p == NULL)
@@ -1150,7 +1099,7 @@
int dlclose(void* handle)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static int (*p)(void* handle) = NULL;
if(p == NULL)
@@ -1159,36 +1108,18 @@
}
void* dlopen(const char* path, int mode)
-{
- // dlopen is special. locking is done inside dyld to allow initializer to run without lock
- DYLD_NO_LOCK_THIS_BLOCK;
-
+{
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void* (*p)(const char* path, int) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_dlopen", (void**)&p);
- void* result = p(path, mode);
- // use asm block to prevent tail call optimization
- // this is needed because dlopen uses __builtin_return_address() and depends on this glue being in the frame chain
- // <rdar://problem/5313172 dlopen() looks too far up stack, can cause crash>
- __asm__ volatile("");
-
- return result;
-}
-
-bool dlopen_preflight(const char* path)
-{
- DYLD_LOCK_THIS_BLOCK;
- static bool (*p)(const char* path) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_dlopen_preflight", (void**)&p);
- return(p(path));
+ return(p(path, mode));
}
void* dlsym(void* handle, const char* symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void* (*p)(void* handle, const char* symbol) = NULL;
if(p == NULL)
@@ -1196,18 +1127,7 @@
return(p(handle, symbol));
}
-void dyld_register_image_state_change_handler(dyld_image_states state,
- bool batch, dyld_image_state_change_handler handler)
-{
- DYLD_LOCK_THIS_BLOCK;
- static void* (*p)(dyld_image_states, bool, dyld_image_state_change_handler) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_dyld_register_image_state_change_handler", (void**)&p);
- p(state, batch, handler);
-}
-
-
-
-
-
+
+
+
+