maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
Eelco Dolstra 2014-08-04 18:02:29 +02:00
parent 7018830509
commit daccd68999
3 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -1792,8 +1792,8 @@ void DerivationGoal::startBuilder()
/* Bind-mount a user-configurable set of directories from the /* Bind-mount a user-configurable set of directories from the
host file system. */ host file system. */
PathSet dirs = tokenizeString<StringSet>(settings.get(string("build-chroot-dirs"), DEFAULT_CHROOT_DIRS)); PathSet dirs = tokenizeString<StringSet>(settings.get("build-chroot-dirs", DEFAULT_CHROOT_DIRS));
PathSet dirs2 = tokenizeString<StringSet>(settings.get(string("build-extra-chroot-dirs"), "")); PathSet dirs2 = tokenizeString<StringSet>(settings.get("build-extra-chroot-dirs", ""));
dirs.insert(dirs2.begin(), dirs2.end()); dirs.insert(dirs2.begin(), dirs2.end());
for (auto & i : dirs) { for (auto & i : dirs) {
size_t p = i.find('='); size_t p = i.find('=');

72
src/libstore/globals.cc
View file

@ -132,37 +132,37 @@ string Settings::get(const string & name, const string & def)
void Settings::update() void Settings::update()
{ {
get(tryFallback, "build-fallback"); _get(tryFallback, "build-fallback");
get(maxBuildJobs, "build-max-jobs"); _get(maxBuildJobs, "build-max-jobs");
get(buildCores, "build-cores"); _get(buildCores, "build-cores");
get(thisSystem, "system"); _get(thisSystem, "system");
get(maxSilentTime, "build-max-silent-time"); _get(maxSilentTime, "build-max-silent-time");
get(buildTimeout, "build-timeout"); _get(buildTimeout, "build-timeout");
get(reservedSize, "gc-reserved-space"); _get(reservedSize, "gc-reserved-space");
get(fsyncMetadata, "fsync-metadata"); _get(fsyncMetadata, "fsync-metadata");
get(useSQLiteWAL, "use-sqlite-wal"); _get(useSQLiteWAL, "use-sqlite-wal");
get(syncBeforeRegistering, "sync-before-registering"); _get(syncBeforeRegistering, "sync-before-registering");
get(useSubstitutes, "build-use-substitutes"); _get(useSubstitutes, "build-use-substitutes");
get(buildUsersGroup, "build-users-group"); _get(buildUsersGroup, "build-users-group");
get(useChroot, "build-use-chroot"); _get(useChroot, "build-use-chroot");
get(impersonateLinux26, "build-impersonate-linux-26"); _get(impersonateLinux26, "build-impersonate-linux-26");
get(keepLog, "build-keep-log"); _get(keepLog, "build-keep-log");
get(compressLog, "build-compress-log"); _get(compressLog, "build-compress-log");
get(maxLogSize, "build-max-log-size"); _get(maxLogSize, "build-max-log-size");
get(cacheFailure, "build-cache-failure"); _get(cacheFailure, "build-cache-failure");
get(pollInterval, "build-poll-interval"); _get(pollInterval, "build-poll-interval");
get(checkRootReachability, "gc-check-reachability"); _get(checkRootReachability, "gc-check-reachability");
get(gcKeepOutputs, "gc-keep-outputs"); _get(gcKeepOutputs, "gc-keep-outputs");
get(gcKeepDerivations, "gc-keep-derivations"); _get(gcKeepDerivations, "gc-keep-derivations");
get(autoOptimiseStore, "auto-optimise-store"); _get(autoOptimiseStore, "auto-optimise-store");
get(envKeepDerivations, "env-keep-derivations"); _get(envKeepDerivations, "env-keep-derivations");
get(sshSubstituterHosts, "ssh-substituter-hosts"); _get(sshSubstituterHosts, "ssh-substituter-hosts");
get(useSshSubstituter, "use-ssh-substituter"); _get(useSshSubstituter, "use-ssh-substituter");
get(logServers, "log-servers"); _get(logServers, "log-servers");
get(enableImportNative, "allow-unsafe-native-code-during-evaluation"); _get(enableImportNative, "allow-unsafe-native-code-during-evaluation");
get(useCaseHack, "use-case-hack"); _get(useCaseHack, "use-case-hack");
get(trustedUsers, "trusted-users"); _get(trustedUsers, "trusted-users");
get(allowedUsers, "allowed-users"); _get(allowedUsers, "allowed-users");
string subs = getEnv("NIX_SUBSTITUTERS", "default"); string subs = getEnv("NIX_SUBSTITUTERS", "default");
if (subs == "default") { if (subs == "default") {
@ -180,7 +180,7 @@ void Settings::update()
} }
void Settings::get(string & res, const string & name) void Settings::_get(string & res, const string & name)
{ {
SettingsMap::iterator i = settings.find(name); SettingsMap::iterator i = settings.find(name);
if (i == settings.end()) return; if (i == settings.end()) return;
@ -188,7 +188,7 @@ void Settings::get(string & res, const string & name)
} }
void Settings::get(bool & res, const string & name) void Settings::_get(bool & res, const string & name)
{ {
SettingsMap::iterator i = settings.find(name); SettingsMap::iterator i = settings.find(name);
if (i == settings.end()) return; if (i == settings.end()) return;
@ -199,7 +199,7 @@ void Settings::get(bool & res, const string & name)
} }
void Settings::get(StringSet & res, const string & name) void Settings::_get(StringSet & res, const string & name)
{ {
SettingsMap::iterator i = settings.find(name); SettingsMap::iterator i = settings.find(name);
if (i == settings.end()) return; if (i == settings.end()) return;
@ -208,7 +208,7 @@ void Settings::get(StringSet & res, const string & name)
res.insert(ss.begin(), ss.end()); res.insert(ss.begin(), ss.end());
} }
void Settings::get(Strings & res, const string & name) void Settings::_get(Strings & res, const string & name)
{ {
SettingsMap::iterator i = settings.find(name); SettingsMap::iterator i = settings.find(name);
if (i == settings.end()) return; if (i == settings.end()) return;
@ -216,7 +216,7 @@ void Settings::get(Strings & res, const string & name)
} }
template<class N> void Settings::get(N & res, const string & name) template<class N> void Settings::_get(N & res, const string & name)
{ {
SettingsMap::iterator i = settings.find(name); SettingsMap::iterator i = settings.find(name);
if (i == settings.end()) return; if (i == settings.end()) return;

10
src/libstore/globals.hh
View file

@ -213,11 +213,11 @@ struct Settings {
private: private:
SettingsMap settings, overrides; SettingsMap settings, overrides;
void get(string & res, const string & name); void _get(string & res, const string & name);
void get(bool & res, const string & name); void _get(bool & res, const string & name);
void get(StringSet & res, const string & name); void _get(StringSet & res, const string & name);
void get(Strings & res, const string & name); void _get(Strings & res, const string & name);
template<class N> void get(N & res, const string & name); template<class N> void _get(N & res, const string & name);
}; };