Loading...
--- dyld/dyld-195.6/src/ImageLoader.cpp
+++ dyld/dyld-132.13/src/ImageLoader.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -40,6 +40,7 @@
uint32_t ImageLoader::fgImagesUsedFromSharedCache = 0;
uint32_t ImageLoader::fgImagesWithUsedPrebinding = 0;
+uint32_t ImageLoader::fgImagesRequiringNoFixups = 0;
uint32_t ImageLoader::fgImagesRequiringCoalescing = 0;
uint32_t ImageLoader::fgImagesHasWeakDefinitions = 0;
uint32_t ImageLoader::fgTotalRebaseFixups = 0;
@@ -58,7 +59,6 @@
uint64_t ImageLoader::fgTotalDOF;
uint64_t ImageLoader::fgTotalInitTime;
uint16_t ImageLoader::fgLoadOrdinal = 0;
-std::vector<ImageLoader::InterposeTuple>ImageLoader::fgInterposingTuples;
uintptr_t ImageLoader::fgNextPIEDylibAddress = 0;
@@ -67,11 +67,10 @@
: fPath(path), fDevice(0), fInode(0), fLastModified(0),
fPathHash(0), fDlopenReferenceCount(0), fStaticReferenceCount(0),
fDynamicReferenceCount(0), fDynamicReferences(NULL), fInitializerRecursiveLock(NULL),
- fDepth(0), fLoadOrder(fgLoadOrdinal++), fState(0), fLibraryCount(libCount),
+ fDepth(0), fLoadOrder(0), fState(0), fLibraryCount(libCount),
fAllLibraryChecksumsAndLoadAddressesMatch(false), fLeaveMapped(false), fNeverUnload(false),
fHideSymbols(false), fMatchByInstallName(false),
- fInterposed(false), fRegisteredDOF(false), fAllLazyPointersBound(false),
- fBeingRemoved(false), fAddFuncNotified(false),
+ fRegisteredDOF(false), fAllLazyPointersBound(false), fBeingRemoved(false), fAddFuncNotified(false),
fPathOwnedByImage(false), fWeakSymbolsBound(false)
{
if ( fPath != NULL )
@@ -83,11 +82,9 @@
{
// this cannot be done in destructor because libImage() is implemented
// in a subclass
- DependentLibraryInfo libraryInfos[image->libraryCount()];
- image->doGetDependentLibraries(libraryInfos);
for(unsigned int i=0; i < image->libraryCount(); ++i) {
ImageLoader* lib = image->libImage(i);
- if ( (lib != NULL) && ! libraryInfos[i].upward )
+ if ( lib != NULL )
lib->fStaticReferenceCount--;
}
delete image;
@@ -99,7 +96,7 @@
if ( fPathOwnedByImage && (fPath != NULL) )
delete [] fPath;
if ( fDynamicReferences != NULL ) {
- for (std::vector<const ImageLoader*>::iterator it = fDynamicReferences->begin(); it != fDynamicReferences->end(); ++it ) {
+ for (std::set<const ImageLoader*>::iterator it = fDynamicReferences->begin(); it != fDynamicReferences->end(); ++it ) {
const_cast<ImageLoader*>(*it)->fDynamicReferenceCount--;
}
delete fDynamicReferences;
@@ -121,20 +118,10 @@
void ImageLoader::addDynamicReference(const ImageLoader* target)
{
- bool alreadyInVector = false;
- if ( fDynamicReferences == NULL ) {
- fDynamicReferences = new std::vector<const ImageLoader*>();
- }
- else {
- for (std::vector<const ImageLoader*>::iterator it = fDynamicReferences->begin(); it != fDynamicReferences->end(); ++it ) {
- if ( *it == target ) {
- alreadyInVector = true;
- break;
- }
- }
- }
- if ( ! alreadyInVector ) {
- fDynamicReferences->push_back(target);
+ if ( fDynamicReferences == NULL )
+ fDynamicReferences = new std::set<const ImageLoader*>();
+ if ( fDynamicReferences->count(target) == 0 ) {
+ fDynamicReferences->insert(target);
const_cast<ImageLoader*>(target)->fDynamicReferenceCount++;
}
//dyld::log("dyld: addDynamicReference() from %s to %s, fDynamicReferences->size()=%lu\n", this->getPath(), target->getPath(), fDynamicReferences->size());
@@ -259,13 +246,6 @@
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
const uint8_t* segStart = (const uint8_t*)segActualLoadAddress(i);
const uint8_t* segEnd = (const uint8_t*)segActualEndAddress(i);
- if ( strcmp(segName(i), "__UNIXSTACK") == 0 ) {
- // __UNIXSTACK never slides. This is the only place that cares
- // and checking for that segment name in segActualLoadAddress()
- // is too expensive.
- segStart -= getSlide();
- segEnd -= getSlide();
- }
if ( (start <= segStart) && (segStart < end) )
return true;
if ( (start <= segEnd) && (segEnd < end) )
@@ -352,20 +332,11 @@
return this->findExportedSymbolInDependentImagesExcept(name, &dontSearchImages[0], cur, &dontSearchImages[imageCount], foundIn);
}
-// this is called by initializeMainExecutable() to interpose on the initial set of images
-void ImageLoader::applyInterposing(const LinkContext& context)
-{
- if ( fgInterposingTuples.size() != 0 )
- this->recursiveApplyInterposing(context);
-}
void ImageLoader::link(const LinkContext& context, bool forceLazysBound, bool preflightOnly, const RPathChain& loaderRPaths)
{
//dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", this->getPath(), fStaticReferenceCount, fNeverUnload);
- // clear error strings
- (*context.setErrorStrings)(dyld_error_kind_none, NULL, NULL, NULL);
-
uint64_t t0 = mach_absolute_time();
this->recursiveLoadLibraries(context, preflightOnly, loaderRPaths);
context.notifyBatch(dyld_image_state_dependents_mapped);
@@ -387,29 +358,20 @@
uint64_t t4 = mach_absolute_time();
this->weakBind(context);
+ context.notifyBatch(dyld_image_state_bound);
+
uint64_t t5 = mach_absolute_time();
-
- context.notifyBatch(dyld_image_state_bound);
- uint64_t t6 = mach_absolute_time();
-
std::vector<DOFInfo> dofs;
this->recursiveGetDOFSections(context, dofs);
context.registerDOFs(dofs);
- uint64_t t7 = mach_absolute_time();
-
- // interpose any dynamically loaded images
- if ( !context.linkingMainExecutable && (fgInterposingTuples.size() != 0) ) {
- this->recursiveApplyInterposing(context);
- }
-
- // clear error strings
- (*context.setErrorStrings)(dyld_error_kind_none, NULL, NULL, NULL);
-
+ uint64_t t6 = mach_absolute_time();
+
+
fgTotalLoadLibrariesTime += t1 - t0;
fgTotalRebaseTime += t3 - t2;
fgTotalBindTime += t4 - t3;
fgTotalWeakBindTime += t5 - t4;
- fgTotalDOF += t7 - t6;
+ fgTotalDOF += t6 - t5;
// done with initial dylib loads
fgNextPIEDylibAddress = 0;
@@ -431,11 +393,11 @@
return false;
}
-void ImageLoader::runInitializers(const LinkContext& context, InitializerTimingList& timingInfo)
+void ImageLoader::runInitializers(const LinkContext& context)
{
uint64_t t1 = mach_absolute_time();
mach_port_t this_thread = mach_thread_self();
- this->recursiveInitialization(context, this_thread, timingInfo);
+ this->recursiveInitialization(context, this_thread);
context.notifyBatch(dyld_image_state_initialized);
mach_port_deallocate(mach_task_self(), this_thread);
uint64_t t2 = mach_absolute_time();
@@ -524,7 +486,7 @@
if ( preflightOnly && context.inSharedCache(requiredLibInfo.name) ) {
// <rdar://problem/5910137> dlopen_preflight() on image in shared cache leaves it loaded but not objc initialized
// in preflight mode, don't even load dylib that are in the shared cache because they will never be unloaded
- setLibImage(i, NULL, false, false);
+ setLibImage(i, NULL, false);
continue;
}
#endif
@@ -538,8 +500,7 @@
}
if ( fNeverUnload )
dependentLib->setNeverUnload();
- if ( ! requiredLibInfo.upward )
- dependentLib->fStaticReferenceCount += 1;
+ dependentLib->fStaticReferenceCount += 1;
LibraryInfo actualInfo = dependentLib->doGetLibraryInfo();
depLibReRequired = requiredLibInfo.required;
depLibCheckSumsMatch = ( actualInfo.checksum == requiredLibInfo.info.checksum );
@@ -550,18 +511,13 @@
}
// check found library version is compatible
if ( actualInfo.minVersion < requiredLibInfo.info.minVersion ) {
- // record values for possible use by CrashReporter or Finder
dyld::throwf("Incompatible library version: %s requires version %d.%d.%d or later, but %s provides version %d.%d.%d",
this->getShortName(), requiredLibInfo.info.minVersion >> 16, (requiredLibInfo.info.minVersion >> 8) & 0xff, requiredLibInfo.info.minVersion & 0xff,
dependentLib->getShortName(), actualInfo.minVersion >> 16, (actualInfo.minVersion >> 8) & 0xff, actualInfo.minVersion & 0xff);
}
- // prebinding for this image disabled if any dependent library changed
- if ( !depLibCheckSumsMatch )
+ // prebinding for this image disabled if any dependent library changed or slid
+ if ( !depLibCheckSumsMatch || (dependentLib->getSlide() != 0) )
canUsePrelinkingInfo = false;
- // prebinding for this image disabled unless both this and dependent are in the shared cache
- if ( !dependentLib->inSharedCache() || !this->inSharedCache() )
- canUsePrelinkingInfo = false;
-
//if ( context.verbosePrebinding ) {
// if ( !requiredLib.checksumMatches )
// fprintf(stderr, "dyld: checksum mismatch, (%u v %u) for %s referencing %s\n",
@@ -575,20 +531,13 @@
// fprintf(stderr, "dyld: exception during processing for %s referencing %s\n", this->getPath(), dependentLib->getPath());
if ( requiredLibInfo.required ) {
fState = dyld_image_state_mapped;
- // record values for possible use by CrashReporter or Finder
- 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_error_kind_dylib_wrong_arch, this->getPath(), requiredLibInfo.name, NULL);
- else
- (*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->getPath(), msg);
}
// 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
}
- setLibImage(i, dependentLib, depLibReExported, requiredLibInfo.upward);
+ setLibImage(i, dependentLib, depLibReExported);
}
fAllLibraryChecksumsAndLoadAddressesMatch = canUsePrelinkingInfo;
@@ -643,36 +592,11 @@
catch (const char* msg) {
// this image is not rebased
fState = dyld_image_state_dependents_mapped;
- CRSetCrashLogMessage2(NULL);
throw;
}
}
}
-void ImageLoader::recursiveApplyInterposing(const LinkContext& context)
-{
- if ( ! fInterposed ) {
- // break cycles
- fInterposed = true;
-
- try {
- // interpose lower level libraries first
- for(unsigned int i=0; i < libraryCount(); ++i) {
- ImageLoader* dependentImage = libImage(i);
- if ( dependentImage != NULL )
- dependentImage->recursiveApplyInterposing(context);
- }
-
- // interpose this image
- doInterpose(context);
- }
- catch (const char* msg) {
- // this image is not interposed
- fInterposed = false;
- throw;
- }
- }
-}
@@ -704,7 +628,6 @@
catch (const char* msg) {
// restore state
fState = dyld_image_state_rebased;
- CRSetCrashLogMessage2(NULL);
throw;
}
}
@@ -721,19 +644,15 @@
// 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]->fWeakSymbolsBound )
++countNotYetWeakBound;
- if ( imagesNeedingCoalescing[i]->hasCoalescedExports() ) {
+ 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
- if ( (countOfImagesWithWeakDefinitionsNotInSharedCache > 0) && (countNotYetWeakBound > 0) ) {
+ if ( (countOfImagesWithWeakDefinitions > 1) && (countNotYetWeakBound > 0) ) {
// make symbol iterators for each
ImageLoader::CoalIterator iterators[count];
ImageLoader::CoalIterator* sortedIts[count];
@@ -862,7 +781,7 @@
}
-void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread, InitializerTimingList& timingInfo)
+void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread)
{
recursive_lock lock_info(this_thread);
recursiveSpinLock(lock_info);
@@ -877,8 +796,8 @@
ImageLoader* dependentImage = libImage(i);
if ( dependentImage != NULL )
// don't try to initialize stuff "above" me
- if ( (dependentImage != NULL) && (dependentImage->fDepth >= fDepth) && !libIsUpward(i) )
- dependentImage->recursiveInitialization(context, this_thread, timingInfo);
+ if ( (dependentImage != NULL) && (dependentImage->fDepth >= fDepth) )
+ dependentImage->recursiveInitialization(context, this_thread);
}
// record termination order
@@ -886,25 +805,17 @@
context.terminationRecorder(this);
// let objc know we are about to initalize this image
- uint64_t t1 = mach_absolute_time();
fState = dyld_image_state_dependents_initialized;
oldState = fState;
context.notifySingle(dyld_image_state_dependents_initialized, this);
-
+
// initialize this image
- bool hasInitializers = this->doInitialization(context);
-
+ this->doInitialization(context);
+
// let anyone know we finished initalizing this image
fState = dyld_image_state_initialized;
oldState = fState;
context.notifySingle(dyld_image_state_initialized, this);
-
- if ( hasInitializers ) {
- uint64_t t2 = mach_absolute_time();
- timingInfo.images[timingInfo.count].image = this;
- timingInfo.images[timingInfo.count].initTime = (t2-t1);
- timingInfo.count++;
- }
}
catch (const char* msg) {
// this image is not initialized
@@ -965,21 +876,14 @@
}
-void ImageLoader::printStatistics(unsigned int imageCount, const InitializerTimingList& timingInfo)
+void ImageLoader::printStatistics(unsigned int imageCount)
{
uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalWeakBindTime + fgTotalDOF + fgTotalInitTime;
char commaNum1[40];
char commaNum2[40];
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 images loaded: %d (%u from dyld shared cache, %u needed no fixups)\n", imageCount, fgImagesUsedFromSharedCache, fgImagesRequiringNoFixups);
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);
@@ -997,11 +901,6 @@
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) {
- dyld::log("%21s ", timingInfo.images[i].image->getShortName());
- printTime("", timingInfo.images[i].initTime, totalTime);
- }
-
}