Loading...
--- dyld/dyld-433.5/src/ImageLoader.cpp
+++ dyld/dyld-239.3/src/ImageLoader.cpp
@@ -53,16 +53,12 @@
uint64_t ImageLoader::fgTotalBytesMapped = 0;
uint64_t ImageLoader::fgTotalBytesPreFetched = 0;
uint64_t ImageLoader::fgTotalLoadLibrariesTime;
-uint64_t ImageLoader::fgTotalObjCSetupTime = 0;
-uint64_t ImageLoader::fgTotalDebuggerPausedTime = 0;
-uint64_t ImageLoader::fgTotalRebindCacheTime = 0;
uint64_t ImageLoader::fgTotalRebaseTime;
uint64_t ImageLoader::fgTotalBindTime;
uint64_t ImageLoader::fgTotalWeakBindTime;
uint64_t ImageLoader::fgTotalDOF;
uint64_t ImageLoader::fgTotalInitTime;
uint16_t ImageLoader::fgLoadOrdinal = 0;
-uint32_t ImageLoader::fgSymbolTrieSearchs = 0;
std::vector<ImageLoader::InterposeTuple>ImageLoader::fgInterposingTuples;
uintptr_t ImageLoader::fgNextPIEDylibAddress = 0;
@@ -110,7 +106,7 @@
void ImageLoader::setMapped(const LinkContext& context)
{
fState = dyld_image_state_mapped;
- context.notifySingle(dyld_image_state_mapped, this, NULL); // note: can throw exception
+ context.notifySingle(dyld_image_state_mapped, this); // note: can throw exception
}
int ImageLoader::compare(const ImageLoader* right) const
@@ -194,20 +190,15 @@
return ( (this->fDevice == stat_buf.st_dev) && (this->fInode == stat_buf.st_ino) );
}
-const char* ImageLoader::shortName(const char* fullName)
+const char* ImageLoader::getShortName() const
{
// try to return leaf name
- if ( fullName != NULL ) {
- const char* s = strrchr(fullName, '/');
+ if ( fPath != NULL ) {
+ const char* s = strrchr(fPath, '/');
if ( s != NULL )
return &s[1];
}
- return fullName;
-}
-
-const char* ImageLoader::getShortName() const
-{
- return shortName(fPath);
+ return fPath;
}
void ImageLoader::setLeaveMapped()
@@ -297,18 +288,6 @@
return true;
}
-bool ImageLoader::findExportedSymbolAddress(const LinkContext& context, const char* symbolName,
- const ImageLoader* requestorImage, int requestorOrdinalOfDef,
- bool runResolver, const ImageLoader** foundIn, uintptr_t* address) const
-{
- const Symbol* sym = this->findExportedSymbol(symbolName, true, foundIn);
- if ( sym != NULL ) {
- *address = (*foundIn)->getExportedSymbolAddress(sym, context, requestorImage, runResolver);
- return true;
- }
- return false;
-}
-
// private method that handles circular dependencies by only search any image once
const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImagesExcept(const char* name,
@@ -317,7 +296,7 @@
const ImageLoader::Symbol* sym;
// search self
if ( notInImgageList(this, dsiStart, dsiCur) ) {
- sym = this->findExportedSymbol(name, false, this->getPath(), foundIn);
+ sym = this->findExportedSymbol(name, false, foundIn);
if ( sym != NULL )
return sym;
*dsiCur++ = this;
@@ -327,7 +306,7 @@
for(unsigned int i=0; i < libraryCount(); ++i) {
ImageLoader* dependentImage = libImage(i);
if ( (dependentImage != NULL) && notInImgageList(dependentImage, dsiStart, dsiCur) ) {
- sym = dependentImage->findExportedSymbol(name, false, libPath(i), foundIn);
+ const ImageLoader::Symbol* sym = dependentImage->findExportedSymbol(name, false, foundIn);
if ( sym != NULL )
return sym;
}
@@ -338,7 +317,7 @@
ImageLoader* dependentImage = libImage(i);
if ( (dependentImage != NULL) && notInImgageList(dependentImage, dsiStart, dsiCur) ) {
*dsiCur++ = dependentImage;
- sym = dependentImage->findExportedSymbolInDependentImagesExcept(name, dsiStart, dsiCur, dsiEnd, foundIn);
+ const ImageLoader::Symbol* sym = dependentImage->findExportedSymbolInDependentImagesExcept(name, dsiStart, dsiCur, dsiEnd, foundIn);
if ( sym != NULL )
return sym;
}
@@ -350,7 +329,7 @@
const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImages(const char* name, const LinkContext& context, const ImageLoader** foundIn) const
{
- unsigned int imageCount = context.imageCount()+2;
+ unsigned int imageCount = context.imageCount();
const ImageLoader* dontSearchImages[imageCount];
dontSearchImages[0] = this; // don't search this image
const ImageLoader** cur = &dontSearchImages[1];
@@ -359,7 +338,7 @@
const ImageLoader::Symbol* ImageLoader::findExportedSymbolInImageOrDependentImages(const char* name, const LinkContext& context, const ImageLoader** foundIn) const
{
- unsigned int imageCount = context.imageCount()+2;
+ unsigned int imageCount = context.imageCount();
const ImageLoader* dontSearchImages[imageCount];
const ImageLoader** cur = &dontSearchImages[0];
return this->findExportedSymbolInDependentImagesExcept(name, &dontSearchImages[0], cur, &dontSearchImages[imageCount], foundIn);
@@ -372,54 +351,17 @@
this->recursiveApplyInterposing(context);
}
-
-uintptr_t ImageLoader::interposedAddress(const LinkContext& context, uintptr_t address, const ImageLoader* inImage, const ImageLoader* onlyInImage)
-{
- //dyld::log("interposedAddress(0x%08llX), tupleCount=%lu\n", (uint64_t)address, fgInterposingTuples.size());
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- //dyld::log(" interposedAddress: replacee=0x%08llX, replacement=0x%08llX, neverImage=%p, onlyImage=%p, inImage=%p\n",
- // (uint64_t)it->replacee, (uint64_t)it->replacement, it->neverImage, it->onlyImage, inImage);
- // replace all references to 'replacee' with 'replacement'
- if ( (address == it->replacee) && (inImage != it->neverImage) && ((it->onlyImage == NULL) || (inImage == it->onlyImage)) ) {
- if ( context.verboseInterposing ) {
- dyld::log("dyld interposing: replace 0x%lX with 0x%lX\n", it->replacee, it->replacement);
- }
- return it->replacement;
- }
- }
- return address;
-}
-
-void ImageLoader::addDynamicInterposingTuples(const struct dyld_interpose_tuple array[], size_t count)
-{
- for(size_t i=0; i < count; ++i) {
- ImageLoader::InterposeTuple tuple;
- tuple.replacement = (uintptr_t)array[i].replacement;
- tuple.neverImage = NULL;
- tuple.onlyImage = this;
- tuple.replacee = (uintptr_t)array[i].replacee;
- // chain to any existing interpositions
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- if ( (it->replacee == tuple.replacee) && (it->onlyImage == this) ) {
- tuple.replacee = it->replacement;
- }
- }
- ImageLoader::fgInterposingTuples.push_back(tuple);
- }
-}
-
-
-void ImageLoader::link(const LinkContext& context, bool forceLazysBound, bool preflightOnly, bool neverUnload, const RPathChain& loaderRPaths, const char* imagePath)
-{
- //dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", imagePath, fDlopenReferenceCount, fNeverUnload);
+void ImageLoader::link(const LinkContext& context, bool forceLazysBound, bool preflightOnly, bool neverUnload, const RPathChain& loaderRPaths)
+{
+ //dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", this->getPath(), fDlopenReferenceCount, fNeverUnload);
// clear error strings
- (*context.setErrorStrings)(0, NULL, NULL, NULL);
+ (*context.setErrorStrings)(dyld_error_kind_none, NULL, NULL, NULL);
uint64_t t0 = mach_absolute_time();
- this->recursiveLoadLibraries(context, preflightOnly, loaderRPaths, imagePath);
- context.notifyBatch(dyld_image_state_dependents_mapped, preflightOnly);
-
+ this->recursiveLoadLibraries(context, preflightOnly, loaderRPaths);
+ context.notifyBatch(dyld_image_state_dependents_mapped);
+
// we only do the loading step for preflights
if ( preflightOnly )
return;
@@ -430,7 +372,7 @@
uint64_t t2 = mach_absolute_time();
this->recursiveRebase(context);
- context.notifyBatch(dyld_image_state_rebased, false);
+ context.notifyBatch(dyld_image_state_rebased);
uint64_t t3 = mach_absolute_time();
this->recursiveBind(context, forceLazysBound, neverUnload);
@@ -440,7 +382,7 @@
this->weakBind(context);
uint64_t t5 = mach_absolute_time();
- context.notifyBatch(dyld_image_state_bound, false);
+ context.notifyBatch(dyld_image_state_bound);
uint64_t t6 = mach_absolute_time();
std::vector<DOFInfo> dofs;
@@ -454,7 +396,7 @@
}
// clear error strings
- (*context.setErrorStrings)(0, NULL, NULL, NULL);
+ (*context.setErrorStrings)(dyld_error_kind_none, NULL, NULL, NULL);
fgTotalLoadLibrariesTime += t1 - t0;
fgTotalRebaseTime += t3 - t2;
@@ -481,39 +423,13 @@
return false;
}
-
-// <rdar://problem/14412057> upward dylib initializers can be run too soon
-// To handle dangling dylibs which are upward linked but not downward, all upward linked dylibs
-// have their initialization postponed until after the recursion through downward dylibs
-// has completed.
-void ImageLoader::processInitializers(const LinkContext& context, mach_port_t thisThread,
- InitializerTimingList& timingInfo, ImageLoader::UninitedUpwards& images)
-{
- uint32_t maxImageCount = context.imageCount()+2;
- ImageLoader::UninitedUpwards upsBuffer[maxImageCount];
- ImageLoader::UninitedUpwards& ups = upsBuffer[0];
- ups.count = 0;
- // Calling recursive init on all images in images list, building a new list of
- // uninitialized upward dependencies.
- for (uintptr_t i=0; i < images.count; ++i) {
- images.images[i]->recursiveInitialization(context, thisThread, images.images[i]->getPath(), timingInfo, ups);
- }
- // If any upward dependencies remain, init them.
- if ( ups.count > 0 )
- processInitializers(context, thisThread, timingInfo, ups);
-}
-
-
void ImageLoader::runInitializers(const LinkContext& context, InitializerTimingList& timingInfo)
{
uint64_t t1 = mach_absolute_time();
- mach_port_t thisThread = mach_thread_self();
- ImageLoader::UninitedUpwards up;
- up.count = 1;
- up.images[0] = this;
- processInitializers(context, thisThread, timingInfo, up);
- context.notifyBatch(dyld_image_state_initialized, false);
- mach_port_deallocate(mach_task_self(), thisThread);
+ mach_port_t this_thread = mach_thread_self();
+ this->recursiveInitialization(context, this_thread, timingInfo);
+ context.notifyBatch(dyld_image_state_initialized);
+ mach_port_deallocate(mach_task_self(), this_thread);
uint64_t t2 = mach_absolute_time();
fgTotalInitTime += (t2 - t1);
}
@@ -595,13 +511,14 @@
}
-void ImageLoader::recursiveLoadLibraries(const LinkContext& context, bool preflightOnly, const RPathChain& loaderRPaths, const char* loadPath)
+void ImageLoader::recursiveLoadLibraries(const LinkContext& context, bool preflightOnly, const RPathChain& loaderRPaths)
{
if ( fState < dyld_image_state_dependents_mapped ) {
// break cycles
fState = dyld_image_state_dependents_mapped;
// get list of libraries this image needs
+ //dyld::log("ImageLoader::recursiveLoadLibraries() %ld = %d*%ld\n", fLibrariesCount*sizeof(DependentLibrary), fLibrariesCount, sizeof(DependentLibrary));
DependentLibraryInfo libraryInfos[fLibraryCount];
this->doGetDependentLibraries(libraryInfos);
@@ -615,7 +532,7 @@
for(unsigned int i=0; i < fLibraryCount; ++i){
ImageLoader* dependentLib;
bool depLibReExported = false;
- bool depLibRequired = false;
+ bool depLibReRequired = false;
bool depLibCheckSumsMatch = false;
DependentLibraryInfo& requiredLibInfo = libraryInfos[i];
#if DYLD_SHARED_CACHE_SUPPORT
@@ -627,11 +544,10 @@
}
#endif
try {
- unsigned cacheIndex;
- dependentLib = context.loadLibrary(requiredLibInfo.name, true, this->getPath(), &thisRPaths, cacheIndex);
+ dependentLib = context.loadLibrary(requiredLibInfo.name, true, this->getPath(), &thisRPaths);
if ( dependentLib == this ) {
// found circular reference, perhaps DYLD_LIBARY_PATH is causing this rdar://problem/3684168
- dependentLib = context.loadLibrary(requiredLibInfo.name, false, NULL, NULL, cacheIndex);
+ dependentLib = context.loadLibrary(requiredLibInfo.name, false, NULL, NULL);
if ( dependentLib != this )
dyld::warn("DYLD_ setting caused circular dependency in %s\n", this->getPath());
}
@@ -642,8 +558,8 @@
else {
dependentLib->fIsReferencedDownward = true;
}
- LibraryInfo actualInfo = dependentLib->doGetLibraryInfo(requiredLibInfo.info);
- depLibRequired = requiredLibInfo.required;
+ LibraryInfo actualInfo = dependentLib->doGetLibraryInfo();
+ depLibReRequired = requiredLibInfo.required;
depLibCheckSumsMatch = ( actualInfo.checksum == requiredLibInfo.info.checksum );
depLibReExported = requiredLibInfo.reExported;
if ( ! depLibReExported ) {
@@ -659,8 +575,8 @@
dependentLib->getShortName(), actualInfo.minVersion >> 16, (actualInfo.minVersion >> 8) & 0xff, actualInfo.minVersion & 0xff);
}
// prebinding for this image disabled if any dependent library changed
- //if ( !depLibCheckSumsMatch )
- // canUsePrelinkingInfo = false;
+ if ( !depLibCheckSumsMatch )
+ canUsePrelinkingInfo = false;
// prebinding for this image disabled unless both this and dependent are in the shared cache
if ( !dependentLib->inSharedCache() || !this->inSharedCache() )
canUsePrelinkingInfo = false;
@@ -679,23 +595,14 @@
if ( requiredLibInfo.required ) {
fState = dyld_image_state_mapped;
// record values for possible use by CrashReporter or Finder
- if ( strstr(msg, "Incompatible library version") != NULL )
- (*context.setErrorStrings)(DYLD_EXIT_REASON_DYLIB_WRONG_VERSION, this->getPath(), requiredLibInfo.name, NULL);
+ if ( strstr(msg, "Incompatible") != NULL )
+ (*context.setErrorStrings)(dyld_error_kind_dylib_version, this->getPath(), requiredLibInfo.name, NULL);
else if ( strstr(msg, "architecture") != NULL )
- (*context.setErrorStrings)(DYLD_EXIT_REASON_DYLIB_WRONG_ARCH, this->getPath(), requiredLibInfo.name, NULL);
- else if ( strstr(msg, "file system sandbox") != NULL )
- (*context.setErrorStrings)(DYLD_EXIT_REASON_FILE_SYSTEM_SANDBOX, this->getPath(), requiredLibInfo.name, NULL);
- else if ( strstr(msg, "code signature") != NULL )
- (*context.setErrorStrings)(DYLD_EXIT_REASON_CODE_SIGNATURE, this->getPath(), requiredLibInfo.name, NULL);
- else if ( strstr(msg, "malformed") != NULL )
- (*context.setErrorStrings)(DYLD_EXIT_REASON_MALFORMED_MACHO, this->getPath(), requiredLibInfo.name, NULL);
+ (*context.setErrorStrings)(dyld_error_kind_dylib_wrong_arch, this->getPath(), requiredLibInfo.name, NULL);
else
- (*context.setErrorStrings)(DYLD_EXIT_REASON_DYLIB_MISSING, this->getPath(), requiredLibInfo.name, NULL);
- const char* newMsg = dyld::mkstringf("Library not loaded: %s\n Referenced from: %s\n Reason: %s", requiredLibInfo.name, this->getRealPath(), msg);
- free((void*)msg); // our free() will do nothing if msg is a string literal
- throw newMsg;
+ (*context.setErrorStrings)(dyld_error_kind_dylib_missing, this->getPath(), requiredLibInfo.name, NULL);
+ dyld::throwf("Library not loaded: %s\n Referenced from: %s\n Reason: %s", requiredLibInfo.name, this->getRealPath(), msg);
}
- free((void*)msg); // our free() will do nothing if msg is a string literal
// ok if weak library not found
dependentLib = NULL;
canUsePrelinkingInfo = false; // this disables all prebinding, we may want to just slam import vectors for this lib to zero
@@ -708,7 +615,7 @@
for(unsigned int i=0; i < libraryCount(); ++i) {
ImageLoader* dependentImage = libImage(i);
if ( dependentImage != NULL ) {
- dependentImage->recursiveLoadLibraries(context, preflightOnly, thisRPaths, libraryInfos[i].name);
+ dependentImage->recursiveLoadLibraries(context, preflightOnly, thisRPaths);
}
}
@@ -750,7 +657,7 @@
doRebase(context);
// notify
- context.notifySingle(dyld_image_state_rebased, this, NULL);
+ context.notifySingle(dyld_image_state_rebased, this);
}
catch (const char* msg) {
// this image is not rebased
@@ -814,7 +721,7 @@
if ( neverUnload )
this->setNeverUnload();
- context.notifySingle(dyld_image_state_bound, this, NULL);
+ context.notifySingle(dyld_image_state_bound, this);
}
catch (const char* msg) {
// restore state
@@ -832,17 +739,20 @@
uint64_t t1 = mach_absolute_time();
// get set of ImageLoaders that participate in coalecsing
ImageLoader* imagesNeedingCoalescing[fgImagesRequiringCoalescing];
- unsigned imageIndexes[fgImagesRequiringCoalescing];
- int count = context.getCoalescedImages(imagesNeedingCoalescing, imageIndexes);
+ int count = context.getCoalescedImages(imagesNeedingCoalescing);
// count how many have not already had weakbinding done
int countNotYetWeakBound = 0;
+ int countOfImagesWithWeakDefinitions = 0;
int countOfImagesWithWeakDefinitionsNotInSharedCache = 0;
for(int i=0; i < count; ++i) {
- if ( ! imagesNeedingCoalescing[i]->weakSymbolsBound(imageIndexes[i]) )
+ if ( ! imagesNeedingCoalescing[i]->fWeakSymbolsBound )
++countNotYetWeakBound;
- if ( ! imagesNeedingCoalescing[i]->inSharedCache() )
- ++countOfImagesWithWeakDefinitionsNotInSharedCache;
+ if ( imagesNeedingCoalescing[i]->hasCoalescedExports() ) {
+ ++countOfImagesWithWeakDefinitions;
+ if ( ! imagesNeedingCoalescing[i]->inSharedCache() )
+ ++countOfImagesWithWeakDefinitionsNotInSharedCache;
+ }
}
// don't need to do any coalescing if only one image has overrides, or all have already been done
@@ -851,10 +761,10 @@
ImageLoader::CoalIterator iterators[count];
ImageLoader::CoalIterator* sortedIts[count];
for(int i=0; i < count; ++i) {
- imagesNeedingCoalescing[i]->initializeCoalIterator(iterators[i], i, imageIndexes[i]);
+ imagesNeedingCoalescing[i]->initializeCoalIterator(iterators[i], i);
sortedIts[i] = &iterators[i];
if ( context.verboseWeakBind )
- dyld::log("dyld: weak bind load order %d/%d for %s\n", i, count, imagesNeedingCoalescing[i]->getIndexedPath(imageIndexes[i]));
+ dyld::log("dyld: weak bind load order %d/%d for %s\n", i, count, imagesNeedingCoalescing[i]->getPath());
}
// walk all symbols keeping iterators in sync by
@@ -887,46 +797,38 @@
// pick first symbol in load order (and non-weak overrides weak)
uintptr_t targetAddr = 0;
ImageLoader* targetImage = NULL;
- unsigned targetImageIndex = 0;
for(int i=0; i < count; ++i) {
if ( strcmp(iterators[i].symbolName, nameToCoalesce) == 0 ) {
if ( context.verboseWeakBind )
- dyld::log("dyld: weak bind, found %s weak=%d in %s \n", nameToCoalesce, iterators[i].weakSymbol, iterators[i].image->getIndexedPath((unsigned)iterators[i].imageIndex));
+ dyld::log("dyld: weak bind, found %s weak=%d in %s \n", nameToCoalesce, iterators[i].weakSymbol, iterators[i].image->getPath());
if ( iterators[i].weakSymbol ) {
if ( targetAddr == 0 ) {
targetAddr = iterators[i].image->getAddressCoalIterator(iterators[i], context);
- if ( targetAddr != 0 ) {
+ if ( targetAddr != 0 )
targetImage = iterators[i].image;
- targetImageIndex = (unsigned)iterators[i].imageIndex;
- }
}
}
else {
targetAddr = iterators[i].image->getAddressCoalIterator(iterators[i], context);
if ( targetAddr != 0 ) {
targetImage = iterators[i].image;
- targetImageIndex = (unsigned)iterators[i].imageIndex;
// strong implementation found, stop searching
break;
}
}
}
}
+ if ( context.verboseWeakBind )
+ dyld::log("dyld: weak binding all uses of %s to copy from %s\n", nameToCoalesce, targetImage->getShortName());
+
// tell each to bind to this symbol (unless already bound)
if ( targetAddr != 0 ) {
- if ( context.verboseWeakBind ) {
- dyld::log("dyld: weak binding all uses of %s to copy from %s\n",
- nameToCoalesce, targetImage->getIndexedShortName(targetImageIndex));
- }
for(int i=0; i < count; ++i) {
if ( strcmp(iterators[i].symbolName, nameToCoalesce) == 0 ) {
- if ( context.verboseWeakBind ) {
- dyld::log("dyld: weak bind, setting all uses of %s in %s to 0x%lX from %s\n",
- nameToCoalesce, iterators[i].image->getIndexedShortName((unsigned)iterators[i].imageIndex),
- targetAddr, targetImage->getIndexedShortName(targetImageIndex));
- }
- if ( ! iterators[i].image->weakSymbolsBound(imageIndexes[i]) )
- iterators[i].image->updateUsesCoalIterator(iterators[i], targetAddr, targetImage, targetImageIndex, context);
+ if ( context.verboseWeakBind )
+ dyld::log("dyld: weak bind, setting all uses of %s in %s to 0x%lX from %s\n", nameToCoalesce, iterators[i].image->getShortName(), targetAddr, targetImage->getShortName());
+ if ( ! iterators[i].image->fWeakSymbolsBound )
+ iterators[i].image->updateUsesCoalIterator(iterators[i], targetAddr, targetImage, context);
iterators[i].symbolMatches = false;
}
}
@@ -937,7 +839,7 @@
// mark all as having all weak symbols bound
for(int i=0; i < count; ++i) {
- imagesNeedingCoalescing[i]->setWeakSymbolsBound(imageIndexes[i]);
+ imagesNeedingCoalescing[i]->fWeakSymbolsBound = true;
}
}
uint64_t t2 = mach_absolute_time();
@@ -998,21 +900,8 @@
fInitializerRecursiveLock = NULL;
}
-void ImageLoader::InitializerTimingList::addTime(const char* name, uint64_t time)
-{
- for (int i=0; i < count; ++i) {
- if ( strcmp(images[i].shortName, name) == 0 ) {
- images[i].initTime += time;
- return;
- }
- }
- images[count].initTime = time;
- images[count].shortName = name;
- ++count;
-}
-
-void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread, const char* pathToInitialize,
- InitializerTimingList& timingInfo, UninitedUpwards& uninitUps)
+
+void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread, InitializerTimingList& timingInfo)
{
recursive_lock lock_info(this_thread);
recursiveSpinLock(lock_info);
@@ -1022,18 +911,17 @@
// break cycles
fState = dyld_image_state_dependents_initialized-1;
try {
+ bool hasUpwards = false;
// initialize lower level libraries first
for(unsigned int i=0; i < libraryCount(); ++i) {
ImageLoader* dependentImage = libImage(i);
if ( dependentImage != NULL ) {
- // don't try to initialize stuff "above" me yet
- if ( libIsUpward(i) ) {
- uninitUps.images[uninitUps.count] = dependentImage;
- uninitUps.count++;
+ // don't try to initialize stuff "above" me
+ bool isUpward = libIsUpward(i);
+ if ( (dependentImage->fDepth >= fDepth) && !isUpward ) {
+ dependentImage->recursiveInitialization(context, this_thread, timingInfo);
}
- else if ( dependentImage->fDepth >= fDepth ) {
- dependentImage->recursiveInitialization(context, this_thread, libPath(i), timingInfo, uninitUps);
- }
+ hasUpwards |= isUpward;
}
}
@@ -1045,19 +933,33 @@
uint64_t t1 = mach_absolute_time();
fState = dyld_image_state_dependents_initialized;
oldState = fState;
- context.notifySingle(dyld_image_state_dependents_initialized, this, &timingInfo);
+ context.notifySingle(dyld_image_state_dependents_initialized, this);
// initialize this image
bool hasInitializers = this->doInitialization(context);
+ // <rdar://problem/10491874> initialize any upward depedencies
+ if ( hasUpwards ) {
+ for(unsigned int i=0; i < libraryCount(); ++i) {
+ ImageLoader* dependentImage = libImage(i);
+ // <rdar://problem/10643239> ObjC CG hang
+ // only init upward lib here if lib is not downwardly referenced somewhere
+ if ( (dependentImage != NULL) && libIsUpward(i) && !dependentImage->isReferencedDownward() ) {
+ dependentImage->recursiveInitialization(context, this_thread, timingInfo);
+ }
+ }
+ }
+
// let anyone know we finished initializing this image
fState = dyld_image_state_initialized;
oldState = fState;
- context.notifySingle(dyld_image_state_initialized, this, NULL);
+ context.notifySingle(dyld_image_state_initialized, this);
if ( hasInitializers ) {
uint64_t t2 = mach_absolute_time();
- timingInfo.addTime(this->getShortName(), t2-t1);
+ timingInfo.images[timingInfo.count].image = this;
+ timingInfo.images[timingInfo.count].initTime = (t2-t1);
+ timingInfo.count++;
}
}
catch (const char* msg) {
@@ -1082,21 +984,16 @@
}
}
if ( partTime < sUnitsPerSecond ) {
- uint32_t milliSecondsTimesHundred = (uint32_t)((partTime*100000)/sUnitsPerSecond);
- uint32_t milliSeconds = (uint32_t)(milliSecondsTimesHundred/100);
- uint32_t percentTimesTen = (uint32_t)((partTime*1000)/totalTime);
+ uint32_t milliSecondsTimesHundred = (partTime*100000)/sUnitsPerSecond;
+ uint32_t milliSeconds = milliSecondsTimesHundred/100;
+ uint32_t percentTimesTen = (partTime*1000)/totalTime;
uint32_t percent = percentTimesTen/10;
- if ( milliSeconds >= 100 )
- dyld::log("%s: %u.%02u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimesHundred-milliSeconds*100, percent, percentTimesTen-percent*10);
- else if ( milliSeconds >= 10 )
- dyld::log("%s: %u.%02u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimesHundred-milliSeconds*100, percent, percentTimesTen-percent*10);
- else
- dyld::log("%s: %u.%02u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimesHundred-milliSeconds*100, percent, percentTimesTen-percent*10);
+ dyld::log("%s: %u.%02u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimesHundred-milliSeconds*100, percent, percentTimesTen-percent*10);
}
else {
- uint32_t secondsTimeTen = (uint32_t)((partTime*10)/sUnitsPerSecond);
+ uint32_t secondsTimeTen = (partTime*10)/sUnitsPerSecond;
uint32_t seconds = secondsTimeTen/10;
- uint32_t percentTimesTen = (uint32_t)((partTime*1000)/totalTime);
+ uint32_t percentTimesTen = (partTime*1000)/totalTime;
uint32_t percent = percentTimesTen/10;
dyld::log("%s: %u.%u seconds (%u.%u%%)\n", msg, seconds, secondsTimeTen-seconds*10, percent, percentTimesTen-percent*10);
}
@@ -1126,43 +1023,25 @@
void ImageLoader::printStatistics(unsigned int imageCount, const InitializerTimingList& timingInfo)
{
- uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalWeakBindTime + fgTotalDOF + fgTotalInitTime;
-
- uint64_t totalDyldTime = totalTime - fgTotalDebuggerPausedTime - fgTotalRebindCacheTime;
- printTime("Total pre-main time", totalDyldTime, totalDyldTime);
- printTime(" dylib loading time", fgTotalLoadLibrariesTime-fgTotalDebuggerPausedTime, totalDyldTime);
- printTime(" rebase/binding time", fgTotalRebaseTime+fgTotalBindTime+fgTotalWeakBindTime-fgTotalRebindCacheTime, totalDyldTime);
- printTime(" ObjC setup time", fgTotalObjCSetupTime, totalDyldTime);
- printTime(" initializer time", fgTotalInitTime-fgTotalObjCSetupTime, totalDyldTime);
- dyld::log(" slowest intializers :\n");
- for (uintptr_t i=0; i < timingInfo.count; ++i) {
- uint64_t t = timingInfo.images[i].initTime;
- if ( t*50 < totalDyldTime )
- continue;
- dyld::log("%30s ", timingInfo.images[i].shortName);
- if ( strncmp(timingInfo.images[i].shortName, "libSystem.", 10) == 0 )
- t -= fgTotalObjCSetupTime;
- printTime("", t, totalDyldTime);
- }
- dyld::log("\n");
-}
-
-void ImageLoader::printStatisticsDetails(unsigned int imageCount, const InitializerTimingList& timingInfo)
-{
- uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalWeakBindTime + fgTotalDOF + fgTotalInitTime;
+ uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalWeakBindTime + fgTotalDOF + fgTotalInitTime;
char commaNum1[40];
char commaNum2[40];
- printTime(" total time", totalTime, totalTime);
- dyld::log(" total images loaded: %d (%u from dyld shared cache)\n", imageCount, fgImagesUsedFromSharedCache);
- dyld::log(" total segments mapped: %u, into %llu pages with %llu pages pre-fetched\n", fgTotalSegmentsMapped, fgTotalBytesMapped/4096, fgTotalBytesPreFetched/4096);
- printTime(" total images loading time", fgTotalLoadLibrariesTime, totalTime);
- printTime(" total load time in ObjC", fgTotalObjCSetupTime, totalTime);
- printTime(" total debugger pause time", fgTotalDebuggerPausedTime, totalTime);
- printTime(" total dtrace DOF registration time", fgTotalDOF, totalTime);
- dyld::log(" total rebase fixups: %s\n", commatize(fgTotalRebaseFixups, commaNum1));
- printTime(" total rebase fixups time", fgTotalRebaseTime, totalTime);
- dyld::log(" total binding fixups: %s\n", commatize(fgTotalBindFixups, commaNum1));
+ printTime("total time", totalTime, totalTime);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ if ( fgImagesUsedFromSharedCache != 0 )
+ dyld::log("total images loaded: %d (%u from dyld shared cache)\n", imageCount, fgImagesUsedFromSharedCache);
+ else
+ dyld::log("total images loaded: %d\n", imageCount);
+#else
+ dyld::log("total images loaded: %d (%u from dyld shared cache)\n", imageCount, fgImagesUsedFromSharedCache);
+#endif
+ dyld::log("total segments mapped: %u, into %llu pages with %llu pages pre-fetched\n", fgTotalSegmentsMapped, fgTotalBytesMapped/4096, fgTotalBytesPreFetched/4096);
+ printTime("total images loading time", fgTotalLoadLibrariesTime, totalTime);
+ printTime("total dtrace DOF registration time", fgTotalDOF, totalTime);
+ dyld::log("total rebase fixups: %s\n", commatize(fgTotalRebaseFixups, commaNum1));
+ printTime("total rebase fixups time", fgTotalRebaseTime, totalTime);
+ dyld::log("total binding fixups: %s\n", commatize(fgTotalBindFixups, commaNum1));
if ( fgTotalBindSymbolsResolved != 0 ) {
uint32_t avgTimesTen = (fgTotalBindImageSearches * 10) / fgTotalBindSymbolsResolved;
uint32_t avgInt = fgTotalBindImageSearches / fgTotalBindSymbolsResolved;
@@ -1170,19 +1049,13 @@
dyld::log("total binding symbol lookups: %s, average images searched per symbol: %u.%u\n",
commatize(fgTotalBindSymbolsResolved, commaNum1), avgInt, avgTenths);
}
- printTime(" total binding fixups time", fgTotalBindTime, totalTime);
- printTime(" total weak binding fixups time", fgTotalWeakBindTime, totalTime);
- printTime(" total redo shared cached bindings time", fgTotalRebindCacheTime, totalTime);
- dyld::log(" total bindings lazily fixed up: %s of %s\n", commatize(fgTotalLazyBindFixups, commaNum1), commatize(fgTotalPossibleLazyBindFixups, commaNum2));
- printTime(" total time in initializers and ObjC +load", fgTotalInitTime-fgTotalObjCSetupTime, totalTime);
+ printTime("total binding fixups time", fgTotalBindTime, totalTime);
+ printTime("total weak binding fixups time", fgTotalWeakBindTime, totalTime);
+ dyld::log("total bindings lazily fixed up: %s of %s\n", commatize(fgTotalLazyBindFixups, commaNum1), commatize(fgTotalPossibleLazyBindFixups, commaNum2));
+ printTime("total initializer time", fgTotalInitTime, totalTime);
for (uintptr_t i=0; i < timingInfo.count; ++i) {
- uint64_t t = timingInfo.images[i].initTime;
- if ( t*1000 < totalTime )
- continue;
- dyld::log("%42s ", timingInfo.images[i].shortName);
- if ( strncmp(timingInfo.images[i].shortName, "libSystem.", 10) == 0 )
- t -= fgTotalObjCSetupTime;
- printTime("", t, totalTime);
+ dyld::log("%21s ", timingInfo.images[i].image->getShortName());
+ printTime("", timingInfo.images[i].initTime, totalTime);
}
}
@@ -1218,128 +1091,6 @@
}
-//
-// This function is the hotspot of symbol lookup. It was pulled out of findExportedSymbol()
-// to enable it to be re-written in assembler if needed.
-//
-const uint8_t* ImageLoader::trieWalk(const uint8_t* start, const uint8_t* end, const char* s)
-{
- //dyld::log("trieWalk(%p, %p, %s)\n", start, end, s);
- ++fgSymbolTrieSearchs;
- const uint8_t* p = start;
- while ( p != NULL ) {
- uintptr_t terminalSize = *p++;
- if ( terminalSize > 127 ) {
- // except for re-export-with-rename, all terminal sizes fit in one byte
- --p;
- terminalSize = read_uleb128(p, end);
- }
- if ( (*s == '\0') && (terminalSize != 0) ) {
- //dyld::log("trieWalk(%p) returning %p\n", start, p);
- return p;
- }
- const uint8_t* children = p + terminalSize;
- if ( children > end ) {
- dyld::log("trieWalk() malformed trie node, terminalSize=0x%lx extends past end of trie\n", terminalSize);
- return NULL;
- }
- //dyld::log("trieWalk(%p) sym=%s, terminalSize=%lu, children=%p\n", start, s, terminalSize, children);
- uint8_t childrenRemaining = *children++;
- p = children;
- uintptr_t nodeOffset = 0;
- for (; childrenRemaining > 0; --childrenRemaining) {
- const char* ss = s;
- //dyld::log("trieWalk(%p) child str=%s\n", start, (char*)p);
- bool wrongEdge = false;
- // scan whole edge to get to next edge
- // if edge is longer than target symbol name, don't read past end of symbol name
- char c = *p;
- while ( c != '\0' ) {
- if ( !wrongEdge ) {
- if ( c != *ss )
- wrongEdge = true;
- ++ss;
- }
- ++p;
- c = *p;
- }
- if ( wrongEdge ) {
- // advance to next child
- ++p; // skip over zero terminator
- // skip over uleb128 until last byte is found
- while ( (*p & 0x80) != 0 )
- ++p;
- ++p; // skip over last byte of uleb128
- if ( p > end ) {
- dyld::log("trieWalk() malformed trie node, child node extends past end of trie\n");
- return NULL;
- }
- }
- else {
- // the symbol so far matches this edge (child)
- // so advance to the child's node
- ++p;
- nodeOffset = read_uleb128(p, end);
- if ( (nodeOffset == 0) || ( &start[nodeOffset] > end) ) {
- dyld::log("trieWalk() malformed trie child, nodeOffset=0x%lx out of range\n", nodeOffset);
- return NULL;
- }
- s = ss;
- //dyld::log("trieWalk() found matching edge advancing to node 0x%lx\n", nodeOffset);
- break;
- }
- }
- if ( nodeOffset != 0 )
- p = &start[nodeOffset];
- else
- p = NULL;
- }
- //dyld::log("trieWalk(%p) return NULL\n", start);
- return NULL;
-}
-
-
-
-uintptr_t ImageLoader::read_uleb128(const uint8_t*& p, const uint8_t* end)
-{
- uint64_t result = 0;
- int bit = 0;
- do {
- if (p == end)
- dyld::throwf("malformed uleb128");
-
- uint64_t slice = *p & 0x7f;
-
- if (bit > 63)
- dyld::throwf("uleb128 too big for uint64, bit=%d, result=0x%0llX", bit, result);
- else {
- result |= (slice << bit);
- bit += 7;
- }
- } while (*p++ & 0x80);
- return result;
-}
-
-
-intptr_t ImageLoader::read_sleb128(const uint8_t*& p, const uint8_t* end)
-{
- int64_t result = 0;
- int bit = 0;
- uint8_t byte;
- do {
- if (p == end)
- throw "malformed sleb128";
- byte = *p++;
- result |= (((int64_t)(byte & 0x7f)) << bit);
- bit += 7;
- } while (byte & 0x80);
- // sign extend negative numbers
- if ( (byte & 0x40) != 0 )
- result |= (-1LL) << bit;
- return result;
-}
-
-
VECTOR_NEVER_DESTRUCTED_IMPL(ImageLoader::InterposeTuple);
VECTOR_NEVER_DESTRUCTED_IMPL(ImagePair);