Loading...
--- dyld/dyld-132.13/src/ImageLoader.cpp
+++ dyld/dyld-239.4/src/ImageLoader.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -24,6 +24,7 @@
#define __STDC_LIMIT_MACROS
#include <stdint.h>
+#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#include <mach/mach.h>
@@ -40,7 +41,6 @@
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;
@@ -59,48 +59,41 @@
uint64_t ImageLoader::fgTotalDOF;
uint64_t ImageLoader::fgTotalInitTime;
uint16_t ImageLoader::fgLoadOrdinal = 0;
+std::vector<ImageLoader::InterposeTuple>ImageLoader::fgInterposingTuples;
uintptr_t ImageLoader::fgNextPIEDylibAddress = 0;
ImageLoader::ImageLoader(const char* path, unsigned int libCount)
- : fPath(path), fDevice(0), fInode(0), fLastModified(0),
- fPathHash(0), fDlopenReferenceCount(0), fStaticReferenceCount(0),
- fDynamicReferenceCount(0), fDynamicReferences(NULL), fInitializerRecursiveLock(NULL),
- fDepth(0), fLoadOrder(0), fState(0), fLibraryCount(libCount),
+ : fPath(path), fRealPath(NULL), fDevice(0), fInode(0), fLastModified(0),
+ fPathHash(0), fDlopenReferenceCount(0), fInitializerRecursiveLock(NULL),
+ fDepth(0), fLoadOrder(fgLoadOrdinal++), fState(0), fLibraryCount(libCount),
fAllLibraryChecksumsAndLoadAddressesMatch(false), fLeaveMapped(false), fNeverUnload(false),
fHideSymbols(false), fMatchByInstallName(false),
- fRegisteredDOF(false), fAllLazyPointersBound(false), fBeingRemoved(false), fAddFuncNotified(false),
- fPathOwnedByImage(false), fWeakSymbolsBound(false)
+ fInterposed(false), fRegisteredDOF(false), fAllLazyPointersBound(false),
+ fBeingRemoved(false), fAddFuncNotified(false),
+ fPathOwnedByImage(false), fIsReferencedDownward(false),
+ fWeakSymbolsBound(false)
{
if ( fPath != NULL )
fPathHash = hash(fPath);
+ if ( libCount > 512 )
+ dyld::throwf("too many dependent dylibs in %s", path);
}
void ImageLoader::deleteImage(ImageLoader* image)
{
- // this cannot be done in destructor because libImage() is implemented
- // in a subclass
- for(unsigned int i=0; i < image->libraryCount(); ++i) {
- ImageLoader* lib = image->libImage(i);
- if ( lib != NULL )
- lib->fStaticReferenceCount--;
- }
delete image;
}
ImageLoader::~ImageLoader()
{
+ if ( fRealPath != NULL )
+ delete [] fRealPath;
if ( fPathOwnedByImage && (fPath != NULL) )
delete [] fPath;
- if ( fDynamicReferences != NULL ) {
- for (std::set<const ImageLoader*>::iterator it = fDynamicReferences->begin(); it != fDynamicReferences->end(); ++it ) {
- const_cast<ImageLoader*>(*it)->fDynamicReferenceCount--;
- }
- delete fDynamicReferences;
- }
}
void ImageLoader::setFileInfo(dev_t device, ino_t inode, time_t modDate)
@@ -114,17 +107,6 @@
{
fState = dyld_image_state_mapped;
context.notifySingle(dyld_image_state_mapped, this); // note: can throw exception
-}
-
-void ImageLoader::addDynamicReference(const ImageLoader* 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());
}
int ImageLoader::compare(const ImageLoader* right) const
@@ -153,6 +135,7 @@
strcpy((char*)fPath, path);
fPathOwnedByImage = true; // delete fPath when this image is destructed
fPathHash = hash(fPath);
+ fRealPath = NULL;
}
void ImageLoader::setPathUnowned(const char* path)
@@ -163,6 +146,21 @@
fPath = path;
fPathOwnedByImage = false;
fPathHash = hash(fPath);
+}
+
+void ImageLoader::setPaths(const char* path, const char* realPath)
+{
+ this->setPath(path);
+ fRealPath = new char[strlen(realPath)+1];
+ strcpy((char*)fRealPath, realPath);
+}
+
+const char* ImageLoader::getRealPath() const
+{
+ if ( fRealPath != NULL )
+ return fRealPath;
+ else
+ return fPath;
}
@@ -230,8 +228,6 @@
bool ImageLoader::containsAddress(const void* addr) const
{
- if ( ! this->isLinked() )
- return false;
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
const uint8_t* start = (const uint8_t*)segActualLoadAddress(i);
const uint8_t* end = (const uint8_t*)segActualEndAddress(i);
@@ -246,6 +242,13 @@
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) )
@@ -267,6 +270,16 @@
}
+
+bool ImageLoader::dependsOn(ImageLoader* image) {
+ for(unsigned int i=0; i < libraryCount(); ++i) {
+ if ( libImage(i) == image )
+ return true;
+ }
+ return false;
+}
+
+
static bool notInImgageList(const ImageLoader* image, const ImageLoader** dsiStart, const ImageLoader** dsiCur)
{
for (const ImageLoader** p = dsiStart; p < dsiCur; ++p)
@@ -281,7 +294,6 @@
const ImageLoader** dsiStart, const ImageLoader**& dsiCur, const ImageLoader** dsiEnd, const ImageLoader** foundIn) const
{
const ImageLoader::Symbol* sym;
-
// search self
if ( notInImgageList(this, dsiStart, dsiCur) ) {
sym = this->findExportedSymbol(name, false, foundIn);
@@ -332,11 +344,20 @@
return this->findExportedSymbolInDependentImagesExcept(name, &dontSearchImages[0], cur, &dontSearchImages[imageCount], foundIn);
}
-
-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);
-
+// 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, bool neverUnload, const RPathChain& loaderRPaths)
+{
+ //dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", this->getPath(), fDlopenReferenceCount, 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);
@@ -354,24 +375,34 @@
context.notifyBatch(dyld_image_state_rebased);
uint64_t t3 = mach_absolute_time();
- this->recursiveBind(context, forceLazysBound);
+ this->recursiveBind(context, forceLazysBound, neverUnload);
uint64_t t4 = mach_absolute_time();
- this->weakBind(context);
+ if ( !context.linkingMainExecutable )
+ this->weakBind(context);
+ uint64_t t5 = mach_absolute_time();
+
context.notifyBatch(dyld_image_state_bound);
-
- uint64_t t5 = mach_absolute_time();
+ uint64_t t6 = mach_absolute_time();
+
std::vector<DOFInfo> dofs;
this->recursiveGetDOFSections(context, dofs);
context.registerDOFs(dofs);
- uint64_t t6 = mach_absolute_time();
-
-
+ 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);
+
fgTotalLoadLibrariesTime += t1 - t0;
fgTotalRebaseTime += t3 - t2;
fgTotalBindTime += t4 - t3;
fgTotalWeakBindTime += t5 - t4;
- fgTotalDOF += t6 - t5;
+ fgTotalDOF += t7 - t6;
// done with initial dylib loads
fgNextPIEDylibAddress = 0;
@@ -380,8 +411,7 @@
void ImageLoader::printReferenceCounts()
{
- dyld::log(" dlopen=%d, static=%d, dynamic=%d for %s\n",
- fDlopenReferenceCount, fStaticReferenceCount, fDynamicReferenceCount, getPath() );
+ dyld::log(" dlopen=%d for %s\n", fDlopenReferenceCount, getPath() );
}
@@ -393,11 +423,11 @@
return false;
}
-void ImageLoader::runInitializers(const LinkContext& context)
+void ImageLoader::runInitializers(const LinkContext& context, InitializerTimingList& timingInfo)
{
uint64_t t1 = mach_absolute_time();
mach_port_t this_thread = mach_thread_self();
- this->recursiveInitialization(context, this_thread);
+ 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();
@@ -430,6 +460,29 @@
}
+void ImageLoader::markedUsedRecursive(const std::vector<DynamicReference>& dynamicReferences)
+{
+ // already visited here
+ if ( fMarkedInUse )
+ return;
+ fMarkedInUse = true;
+
+ // clear mark on all statically dependent dylibs
+ for(unsigned int i=0; i < libraryCount(); ++i) {
+ ImageLoader* dependentImage = libImage(i);
+ if ( dependentImage != NULL ) {
+ dependentImage->markedUsedRecursive(dynamicReferences);
+ }
+ }
+
+ // clear mark on all dynamically dependent dylibs
+ for (std::vector<ImageLoader::DynamicReference>::const_iterator it=dynamicReferences.begin(); it != dynamicReferences.end(); ++it) {
+ if ( it->from == this )
+ it->to->markedUsedRecursive(dynamicReferences);
+ }
+
+}
+
unsigned int ImageLoader::recursiveUpdateDepth(unsigned int maxDepth)
{
// the purpose of this phase is to make the images sortable such that
@@ -443,7 +496,7 @@
unsigned int minDependentDepth = maxDepth;
for(unsigned int i=0; i < libraryCount(); ++i) {
ImageLoader* dependentImage = libImage(i);
- if ( dependentImage != NULL ) {
+ if ( (dependentImage != NULL) && !libIsUpward(i) ) {
unsigned int d = dependentImage->recursiveUpdateDepth(maxDepth);
if ( d < minDependentDepth )
minDependentDepth = d;
@@ -486,7 +539,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);
+ setLibImage(i, NULL, false, false);
continue;
}
#endif
@@ -500,7 +553,11 @@
}
if ( fNeverUnload )
dependentLib->setNeverUnload();
- dependentLib->fStaticReferenceCount += 1;
+ if ( requiredLibInfo.upward ) {
+ }
+ else {
+ dependentLib->fIsReferencedDownward = true;
+ }
LibraryInfo actualInfo = dependentLib->doGetLibraryInfo();
depLibReRequired = requiredLibInfo.required;
depLibCheckSumsMatch = ( actualInfo.checksum == requiredLibInfo.info.checksum );
@@ -510,14 +567,20 @@
depLibReExported = dependentLib->isSubframeworkOf(context, this) || this->hasSubLibrary(context, dependentLib);
}
// check found library version is compatible
- if ( actualInfo.minVersion < requiredLibInfo.info.minVersion ) {
+ // <rdar://problem/89200806> 0xFFFFFFFF is wildcard that matches any version
+ if ( (requiredLibInfo.info.minVersion != 0xFFFFFFFF) && (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 or slid
- if ( !depLibCheckSumsMatch || (dependentLib->getSlide() != 0) )
+ // prebinding for this image disabled if any dependent library changed
+ 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;
+
//if ( context.verbosePrebinding ) {
// if ( !requiredLib.checksumMatches )
// fprintf(stderr, "dyld: checksum mismatch, (%u v %u) for %s referencing %s\n",
@@ -531,13 +594,20 @@
// fprintf(stderr, "dyld: exception during processing for %s referencing %s\n", this->getPath(), dependentLib->getPath());
if ( requiredLibInfo.required ) {
fState = dyld_image_state_mapped;
- dyld::throwf("Library not loaded: %s\n Referenced from: %s\n Reason: %s", requiredLibInfo.name, this->getPath(), msg);
+ // 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->getRealPath(), 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);
+ setLibImage(i, dependentLib, depLibReExported, requiredLibInfo.upward);
}
fAllLibraryChecksumsAndLoadAddressesMatch = canUsePrelinkingInfo;
@@ -592,15 +662,40 @@
catch (const char* msg) {
// this image is not rebased
fState = dyld_image_state_dependents_mapped;
+ CRSetCrashLogMessage2(NULL);
throw;
}
}
}
-
-
-
-void ImageLoader::recursiveBind(const LinkContext& context, bool forceLazysBound)
+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;
+ }
+ }
+}
+
+
+
+void ImageLoader::recursiveBind(const LinkContext& context, bool forceLazysBound, bool neverUnload)
{
// Normally just non-lazy pointers are bound immediately.
// The exceptions are:
@@ -615,19 +710,23 @@
for(unsigned int i=0; i < libraryCount(); ++i) {
ImageLoader* dependentImage = libImage(i);
if ( dependentImage != NULL )
- dependentImage->recursiveBind(context, forceLazysBound);
+ dependentImage->recursiveBind(context, forceLazysBound, neverUnload);
}
// bind this image
this->doBind(context, forceLazysBound);
// mark if lazys are also bound
if ( forceLazysBound || this->usablePrebinding(context) )
fAllLazyPointersBound = true;
+ // mark as never-unload if requested
+ if ( neverUnload )
+ this->setNeverUnload();
context.notifySingle(dyld_image_state_bound, this);
}
catch (const char* msg) {
// restore state
fState = dyld_image_state_rebased;
+ CRSetCrashLogMessage2(NULL);
throw;
}
}
@@ -637,6 +736,7 @@
{
if ( context.verboseWeakBind )
dyld::log("dyld: weak bind start:\n");
+ uint64_t t1 = mach_absolute_time();
// get set of ImageLoaders that participate in coalecsing
ImageLoader* imagesNeedingCoalescing[fgImagesRequiringCoalescing];
int count = context.getCoalescedImages(imagesNeedingCoalescing);
@@ -644,15 +744,19 @@
// 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 ( (countOfImagesWithWeakDefinitions > 1) && (countNotYetWeakBound > 0) ) {
+ if ( (countOfImagesWithWeakDefinitionsNotInSharedCache > 0) && (countNotYetWeakBound > 0) ) {
// make symbol iterators for each
ImageLoader::CoalIterator iterators[count];
ImageLoader::CoalIterator* sortedIts[count];
@@ -738,6 +842,9 @@
imagesNeedingCoalescing[i]->fWeakSymbolsBound = true;
}
}
+ uint64_t t2 = mach_absolute_time();
+ fgTotalWeakBindTime += t2 - t1;
+
if ( context.verboseWeakBind )
dyld::log("dyld: weak bind end\n");
}
@@ -760,6 +867,19 @@
}
}
+void ImageLoader::setNeverUnloadRecursive() {
+ if ( ! fNeverUnload ) {
+ // break cycles
+ fNeverUnload = true;
+
+ // gather lower level libraries first
+ for(unsigned int i=0; i < libraryCount(); ++i) {
+ ImageLoader* dependentImage = libImage(i);
+ if ( dependentImage != NULL )
+ dependentImage->setNeverUnloadRecursive();
+ }
+ }
+}
void ImageLoader::recursiveSpinLock(recursive_lock& rlock)
{
@@ -781,7 +901,7 @@
}
-void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread)
+void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread, InitializerTimingList& timingInfo)
{
recursive_lock lock_info(this_thread);
recursiveSpinLock(lock_info);
@@ -791,31 +911,56 @@
// 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
- if ( (dependentImage != NULL) && (dependentImage->fDepth >= fDepth) )
- dependentImage->recursiveInitialization(context, this_thread);
+ if ( dependentImage != NULL ) {
+ // don't try to initialize stuff "above" me
+ bool isUpward = libIsUpward(i);
+ if ( (dependentImage->fDepth >= fDepth) && !isUpward ) {
+ dependentImage->recursiveInitialization(context, this_thread, timingInfo);
+ }
+ hasUpwards |= isUpward;
+ }
}
// record termination order
if ( this->needsTermination() )
context.terminationRecorder(this);
- // let objc know we are about to initalize this image
+ // let objc know we are about to initialize 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
- this->doInitialization(context);
-
- // let anyone know we finished initalizing 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);
+
+ 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
@@ -876,14 +1021,21 @@
}
-void ImageLoader::printStatistics(unsigned int imageCount)
+void ImageLoader::printStatistics(unsigned int imageCount, const InitializerTimingList& timingInfo)
{
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, %u needed no fixups)\n", imageCount, fgImagesUsedFromSharedCache, fgImagesRequiringNoFixups);
+#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);
@@ -901,6 +1053,11 @@
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);
+ }
+
}
@@ -934,5 +1091,8 @@
}
-
-
+VECTOR_NEVER_DESTRUCTED_IMPL(ImageLoader::InterposeTuple);
+VECTOR_NEVER_DESTRUCTED_IMPL(ImagePair);
+
+
+