Loading...
--- dyld/dyld-750.5/dyld3/shared-cache/mrm_shared_cache_builder.cpp
+++ dyld/dyld-640.2/dyld3/shared-cache/mrm_shared_cache_builder.cpp
@@ -23,20 +23,16 @@
*/
#include "mrm_shared_cache_builder.h"
-#include "SharedCacheBuilder.h"
+#include "CacheBuilder.h"
#include "ClosureFileSystem.h"
#include "FileUtils.h"
#include <pthread.h>
#include <memory>
#include <vector>
#include <map>
-#include <sys/stat.h>
static const uint64_t kMinBuildVersion = 1; //The minimum version BuildOptions struct we can support
static const uint64_t kMaxBuildVersion = 1; //The maximum version BuildOptions struct we can support
-
-static const uint32_t MajorVersion = 1;
-static const uint32_t MinorVersion = 0;
namespace dyld3 {
namespace closure {
@@ -97,7 +93,6 @@
info.fileContentLen = fileInfo.length;
info.sliceOffset = 0;
info.sliceLen = fileInfo.length;
- info.isSipProtected = false;
info.inode = fileInfo.inode;
info.mtime = fileInfo.mtime;
info.unload = nullptr;
@@ -116,8 +111,7 @@
info.fileContentLen = keepLength;
}
- bool fileExists(const char* path, uint64_t* inode=nullptr, uint64_t* mtime=nullptr,
- bool* issetuid=nullptr, bool* inodesMatchRuntime = nullptr) const override {
+ bool fileExists(const char* path, uint64_t* inode=nullptr, uint64_t* mtime=nullptr, bool* issetuid=nullptr) const override {
Diagnostics diag;
std::string resolvedPath = symlinkResolver.realPath(diag, path);
if (diag.hasError()) {
@@ -138,8 +132,6 @@
*mtime = fileInfo.mtime;
if (issetuid)
*issetuid = false;
- if (inodesMatchRuntime)
- *inodesMatchRuntime = false;
return true;
}
@@ -155,10 +147,11 @@
if (diag.hasError())
return false;
- // on iOS, inode is just a placeholder
- // Note its safe to just use the index here as we only compare it during closure building
- // and never record it in the closures
- uint64_t inode = files.size() + 1;
+ // on iOS, inode is used to hold hash of path
+ uint64_t hash = 0;
+ for (const char* s = path; *s != '\0'; ++s)
+ hash += hash*4 + *s;
+ uint64_t inode = hash;
uint64_t mtime = 0;
files.push_back((FileInfo){ path, data, size, fileFlags, mtime, inode });
@@ -194,7 +187,7 @@
struct BuildInstance {
std::unique_ptr<DyldSharedCache::CreateOptions> options;
- std::unique_ptr<SharedCacheBuilder> builder;
+ std::unique_ptr<CacheBuilder> builder;
std::vector<CacheBuilder::InputFile> inputFiles;
std::vector<const char*> errors;
std::vector<const char*> warnings;
@@ -202,10 +195,9 @@
std::vector<std::string> warningStrings; // Owns the data for the warnings
uint8_t* cacheData = nullptr;
uint64_t cacheSize = 0;
- std::string jsonMap;
+ uint8_t* cacheMapData = nullptr;
+ uint64_t cacheMapSize = 0;
std::string cdHash; // Owns the data for the cdHash
- std::string cdHashType; // Owns the data for the cdHashType
- std::string uuid; // Owns the data for the uuid
};
struct BuildFileResult {
@@ -214,8 +206,8 @@
uint64_t size;
};
-struct MRMSharedCacheBuilder {
- MRMSharedCacheBuilder(const BuildOptions_v1* options);
+struct SharedCacheBuilder {
+ SharedCacheBuilder(const BuildOptions_v1* options);
const BuildOptions_v1* options;
dyld3::closure::FileSystemMRM fileSystem;
@@ -225,25 +217,11 @@
// An array of builders and their options as we may have more than one builder for a given device variant.
std::vector<BuildInstance> builders;
- // The paths in all of the caches
- // We keep this here to own the std::string path data
- std::map<std::string, uint32_t> dylibsInCaches;
-
// The results from all of the builders
// We keep this in a vector to own the data.
- std::vector<FileResult*> fileResults;
- std::vector<FileResult> fileResultStorage;
-
- // The results from all of the builders
- // We keep this in a vector to own the data.
- std::vector<CacheResult*> cacheResults;
- std::vector<CacheResult> cacheResultStorage;
-
- // The files to remove. These are in every copy of the caches we built
- std::vector<const char*> filesToRemove;
-
- std::vector<const char*> errors;
- std::vector<std::string> errorStorage;
+ std::vector<BuildFileResult> fileResults;
+
+ std::vector<std::string> errors;
pthread_mutex_t lock;
enum State {
@@ -268,16 +246,15 @@
diag.error(format, list);
va_end(list);
- errorStorage.push_back(diag.errorMessage());
- errors.push_back(errorStorage.back().data());
+ errors.push_back(diag.errorMessage());
}
};
-MRMSharedCacheBuilder::MRMSharedCacheBuilder(const BuildOptions_v1* options) : options(options), lock(PTHREAD_MUTEX_INITIALIZER) {
-
-}
-
-void validiateBuildOptions(const BuildOptions_v1* options, MRMSharedCacheBuilder& builder) {
+SharedCacheBuilder::SharedCacheBuilder(const BuildOptions_v1* options) : options(options), lock(PTHREAD_MUTEX_INITIALIZER) {
+
+}
+
+void validiateBuildOptions(const BuildOptions_v1* options, SharedCacheBuilder& builder) {
if (options->version < kMinBuildVersion) {
builder.error("Builder version %llu is less than minimum supported version of %llu", options->version, kMinBuildVersion);
}
@@ -325,13 +302,8 @@
}
}
-void getVersion(uint32_t *major, uint32_t *minor) {
- *major = MajorVersion;
- *minor = MinorVersion;
-}
-
-struct MRMSharedCacheBuilder* createSharedCacheBuilder(const BuildOptions_v1* options) {
- MRMSharedCacheBuilder* builder = new MRMSharedCacheBuilder(options);
+struct SharedCacheBuilder* createSharedCacheBuilder(const BuildOptions_v1* options) {
+ SharedCacheBuilder* builder = new SharedCacheBuilder(options);
// Check the option struct values are valid
validiateBuildOptions(options, *builder);
@@ -339,10 +311,10 @@
return builder;
}
-bool addFile(struct MRMSharedCacheBuilder* builder, const char* path, uint8_t* data, uint64_t size, FileFlags fileFlags) {
+bool addFile(struct SharedCacheBuilder* builder, const char* path, uint8_t* data, uint64_t size, FileFlags fileFlags) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Cannot add file: '%s' as we have already started building", path);
return;
}
@@ -379,8 +351,7 @@
}
Diagnostics diag;
if (!builder->fileSystem.addFile(path, data, size, diag, fileFlags)) {
- builder->errorStorage.push_back(diag.errorMessage());
- builder->errors.push_back(builder->errorStorage.back().data());
+ builder->errors.push_back(diag.errorMessage());
return;
}
success = true;
@@ -388,10 +359,10 @@
return success;
}
-bool addSymlink(struct MRMSharedCacheBuilder* builder, const char* fromPath, const char* toPath) {
+bool addSymlink(struct SharedCacheBuilder* builder, const char* fromPath, const char* toPath) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Cannot add file: '%s' as we have already started building", fromPath);
return;
}
@@ -406,8 +377,7 @@
}
Diagnostics diag;
if (!builder->fileSystem.addSymlink(fromPath, toPath, diag)) {
- builder->errorStorage.push_back(diag.errorMessage());
- builder->errors.push_back(builder->errorStorage.back().data());
+ builder->errors.push_back(diag.errorMessage());
return;
}
success = true;
@@ -481,14 +451,14 @@
}
}
-bool runSharedCacheBuilder(struct MRMSharedCacheBuilder* builder) {
+bool runSharedCacheBuilder(struct SharedCacheBuilder* builder) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Builder has already been run");
return;
}
- builder->state = MRMSharedCacheBuilder::Building;
+ builder->state = SharedCacheBuilder::Building;
if (builder->fileSystem.fileCount() == 0) {
builder->error("Cannot run builder with no files");
}
@@ -534,8 +504,8 @@
const char *cacheSuffix = (isOptimized ? "" : ".development");
std::string runtimePath = (builder->options->platform == Platform::macOS) ? "/private/var/db/dyld/" : "/System/Library/Caches/com.apple.dyld/";
options->outputFilePath = runtimePath + "dyld_shared_cache_" + builder->options->archs[i] + cacheSuffix;
- options->outputMapFilePath = options->outputFilePath + ".json";
- options->archs = &dyld3::GradedArchs::forName(builder->options->archs[i]);
+ options->outputMapFilePath = options->outputFilePath + ".map";
+ options->archName = builder->options->archs[i];
options->platform = (dyld3::Platform)builder->options->platform;
options->excludeLocalSymbols = platformExcludeLocalSymbols(builder->options->platform);
options->optimizeStubs = isOptimized;
@@ -549,10 +519,11 @@
options->verbose = builder->options->verboseDiagnostics;
options->evictLeafDylibsOnOverflow = true;
options->loggingPrefix = std::string(builder->options->deviceName) + dispositionName(builder->options->disposition) + "." + builder->options->archs[i] + cacheSuffix;
+ options->pathPrefixes = { "" };
options->dylibOrdering = parseOrderFile(builder->dylibOrderFileData);
options->dirtyDataSegmentOrdering = parseOrderFile(builder->dirtyDataOrderFileData);
- auto cacheBuilder = std::make_unique<SharedCacheBuilder>(*options.get(), builder->fileSystem);
+ auto cacheBuilder = std::make_unique<CacheBuilder>(*options.get(), builder->fileSystem);
builder->builders.emplace_back((BuildInstance) { std::move(options), std::move(cacheBuilder), inputFiles });
}
};
@@ -566,20 +537,18 @@
break;
case Disposition::Customer:
addCacheConfiguration(true);
- break;
case Disposition::InternalMinDevelopment:
addCacheConfiguration(false);
- break;
}
// FIXME: This step can run in parallel.
for (auto& buildInstance : builder->builders) {
- SharedCacheBuilder* cacheBuilder = buildInstance.builder.get();
- cacheBuilder->build(buildInstance.inputFiles, aliases);
+ CacheBuilder* builder = buildInstance.builder.get();
+ builder->build(buildInstance.inputFiles, aliases);
// First put the warnings in to a vector to own them.
- buildInstance.warningStrings.reserve(cacheBuilder->warnings().size());
- for (const std::string& warning : cacheBuilder->warnings())
+ buildInstance.warningStrings.reserve(builder->warnings().size());
+ for (const std::string& warning : builder->warnings())
buildInstance.warningStrings.push_back(warning);
// Then copy to a vector to reference the owner
@@ -587,9 +556,9 @@
for (const std::string& warning : buildInstance.warningStrings)
buildInstance.warnings.push_back(warning.c_str());
- if (!cacheBuilder->errorMessage().empty()) {
+ if (!builder->errorMessage().empty()) {
// First put the errors in to a vector to own them.
- buildInstance.errorStrings.push_back(cacheBuilder->errorMessage());
+ buildInstance.errorStrings.push_back(builder->errorMessage());
// Then copy to a vector to reference the owner
buildInstance.errors.reserve(buildInstance.errorStrings.size());
@@ -597,127 +566,82 @@
buildInstance.errors.push_back(error.c_str());
}
- if (cacheBuilder->errorMessage().empty()) {
- cacheBuilder->writeBuffer(buildInstance.cacheData, buildInstance.cacheSize);
- buildInstance.jsonMap = cacheBuilder->getMapFileBuffer(builder->options->deviceName);
- buildInstance.cdHash = cacheBuilder->cdHashFirst();
- buildInstance.uuid = cacheBuilder->uuid();
- switch (buildInstance.options->codeSigningDigestMode) {
- case DyldSharedCache::SHA256only:
- buildInstance.cdHashType = "sha256";
- break;
- case DyldSharedCache::SHA1only:
- buildInstance.cdHashType = "sha1";
- break;
- case DyldSharedCache::Agile:
- buildInstance.cdHashType = "sha1";
- break;
- }
+ if (builder->errorMessage().empty()) {
+ builder->writeBuffer(buildInstance.cacheData, buildInstance.cacheSize);
+ builder->writeMapFileBuffer(buildInstance.cacheMapData, buildInstance.cacheMapSize);
+ buildInstance.cdHash = builder->cdHashFirst();
}
}
// Now that we have run all of the builds, collect the results
// First push file results for each of the shared caches we built
- for (auto& buildInstance : builder->builders) {
- SharedCacheBuilder* cacheBuilder = buildInstance.builder.get();
-
- CacheResult cacheBuildResult;
- cacheBuildResult.version = 1;
- cacheBuildResult.loggingPrefix = buildInstance.options->loggingPrefix.c_str();
- cacheBuildResult.deviceConfiguration = buildInstance.options->loggingPrefix.c_str();
- cacheBuildResult.warnings = buildInstance.warnings.empty() ? nullptr : buildInstance.warnings.data();
- cacheBuildResult.numWarnings = buildInstance.warnings.size();
- cacheBuildResult.errors = buildInstance.errors.empty() ? nullptr : buildInstance.errors.data();
- cacheBuildResult.numErrors = buildInstance.errors.size();
- cacheBuildResult.uuidString = buildInstance.uuid.c_str();
- cacheBuildResult.mapJSON = buildInstance.jsonMap.c_str();
-
- builder->cacheResultStorage.emplace_back(cacheBuildResult);
-
- if (!cacheBuilder->errorMessage().empty())
- continue;
-
- FileResult cacheFileResult;
- cacheFileResult.version = 1;
- cacheFileResult.path = buildInstance.options->outputFilePath.c_str();
- cacheFileResult.behavior = AddFile;
- cacheFileResult.data = buildInstance.cacheData;
- cacheFileResult.size = buildInstance.cacheSize;
- cacheFileResult.hashArch = buildInstance.options->archs->name();
- cacheFileResult.hashType = buildInstance.cdHashType.c_str();
- cacheFileResult.hash = buildInstance.cdHash.c_str();
-
- builder->fileResultStorage.emplace_back(cacheFileResult);
-
- cacheBuilder->forEachCacheDylib(^(const std::string &path) {
- ++builder->dylibsInCaches[path.c_str()];
- });
- }
-
- // Copy from the storage to the vector we can return to the API.
- for (auto &fileResult : builder->fileResultStorage)
- builder->fileResults.push_back(&fileResult);
- for (auto &cacheResult : builder->cacheResultStorage)
- builder->cacheResults.push_back(&cacheResult);
-
-
- // Add entries to tell us to remove all of the dylibs from disk which are in every cache.
- const size_t numCaches = builder->builders.size();
- for (const auto& dylibAndCount : builder->dylibsInCaches) {
- if (dylibAndCount.second == numCaches) {
- builder->filesToRemove.push_back(dylibAndCount.first.c_str());
- }
- }
-
- // Quit if we had any errors.
+ __block std::map<std::string, uint32_t> dylibsInCaches;
for (auto& buildInstance : builder->builders) {
CacheBuilder* cacheBuilder = buildInstance.builder.get();
if (!cacheBuilder->errorMessage().empty())
- return;
- }
-
- builder->state = MRMSharedCacheBuilder::FinishedBuilding;
+ continue;
+ builder->fileResults.push_back((BuildFileResult) { buildInstance.options->outputFilePath, buildInstance.cacheData, buildInstance.cacheSize });
+ builder->fileResults.push_back((BuildFileResult) { buildInstance.options->outputMapFilePath, buildInstance.cacheMapData, buildInstance.cacheMapSize });
+
+ cacheBuilder->forEachCacheDylib(^(const std::string &path) {
+ ++dylibsInCaches[path];
+ });
+ }
+
+ // Add entries to tell us to remove all of the dylibs from disk which are in every cache.
+ const size_t numCaches = builder->builders.size();
+ for (const auto& dylibAndCount : dylibsInCaches) {
+ if (dylibAndCount.second == numCaches)
+ builder->fileResults.push_back((BuildFileResult) { dylibAndCount.first, nullptr, 0 });
+ }
+
+ builder->state = SharedCacheBuilder::FinishedBuilding;
success = true;
});
return success;
}
-const char* const* getErrors(const struct MRMSharedCacheBuilder* builder, uint64_t* errorCount) {
- if (builder->errors.empty())
+uint64_t getErrorCount(const struct SharedCacheBuilder* builder) {
+ return builder->errors.size();
+}
+
+const char* getError(const struct SharedCacheBuilder* builder, uint64_t errorIndex) {
+ if (errorIndex >= builder->errors.size())
return nullptr;
- *errorCount = builder->errors.size();
- return builder->errors.data();
-}
-
-const struct FileResult* const* getFileResults(struct MRMSharedCacheBuilder* builder, uint64_t* resultCount) {
- if (builder->fileResults.empty())
- return nullptr;
- *resultCount = builder->fileResults.size();
- return builder->fileResults.data();
-}
-
-const struct CacheResult* const* getCacheResults(struct MRMSharedCacheBuilder* builder, uint64_t* resultCount) {
- if (builder->cacheResults.empty())
- return nullptr;
- *resultCount = builder->cacheResults.size();
- return builder->cacheResults.data();
-}
-
-const char* const* getFilesToRemove(const struct MRMSharedCacheBuilder* builder, uint64_t* fileCount) {
- if (builder->filesToRemove.empty())
- return nullptr;
- *fileCount = builder->filesToRemove.size();
- return builder->filesToRemove.data();
-}
-
-void destroySharedCacheBuilder(struct MRMSharedCacheBuilder* builder) {
- for (auto& buildInstance : builder->builders) {
- SharedCacheBuilder* cacheBuilder = buildInstance.builder.get();
- cacheBuilder->deleteBuffer();
- }
- for (auto &fileResult : builder->fileResultStorage) {
- free((void*)fileResult.data);
- fileResult.data = nullptr;
- }
+ return builder->errors[errorIndex].c_str();
+}
+
+uint64_t getCacheResultCount(const struct SharedCacheBuilder* builder) {
+ return builder->builders.size();
+}
+
+void getCacheResult(struct SharedCacheBuilder* builder, uint64_t cacheIndex, BuildResult* result) {
+ if (cacheIndex >= builder->builders.size())
+ return;
+
+ BuildInstance& buildInstance = builder->builders[cacheIndex];
+
+ result->version = 1;
+ result->loggingPrefix = buildInstance.options->loggingPrefix.c_str();
+ result->warnings = buildInstance.warnings.empty() ? nullptr : buildInstance.warnings.data();
+ result->numWarnings = buildInstance.warnings.size();
+ result->errors = buildInstance.errors.empty() ? nullptr : buildInstance.errors.data();
+ result->numErrors = buildInstance.errors.size();
+ result->sharedCachePath = buildInstance.options->outputFilePath.c_str();
+ result->cdHash = buildInstance.cdHash.c_str();
+}
+
+uint64_t getFileResultCount(const struct SharedCacheBuilder* builder) {
+ return builder->fileResults.size();
+}
+
+void getFileResult(struct SharedCacheBuilder* builder, uint64_t fileIndex, FileResult* result) {
+ if (fileIndex >= builder->fileResults.size())
+ return;
+ const BuildFileResult& buildFileResult = builder->fileResults[fileIndex];
+ *result = (FileResult) { buildFileResult.path.c_str(), buildFileResult.data, buildFileResult.size };
+}
+
+void destroySharedCacheBuilder(struct SharedCacheBuilder* builder) {
delete builder;
}