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

refactor(3p/nix/libexpr): Replace logging.h with glog

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 01:24:50 +01:00
parent d0c44425e1
commit 939dd9f817
8 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libexpr/eval.cc vendored
View file

@ -16,6 +16,7 @@
#include "json.hh"
#include "store-api.hh"
#include "util.hh"
#include <glog/logging.h>
#if HAVE_BOEHMGC
@ -232,7 +233,7 @@ void initGC() {
if (pageSize != -1) size = (pageSize * pages) / 4; // 25% of RAM
if (size > maxSize) size = maxSize;
#endif
debug(format("setting initial heap size to %1% bytes") % size);
DLOG(INFO) << "setting initial heap size to " << size << " bytes";
GC_expand_hp(size);
}
@ -375,7 +376,7 @@ Path EvalState::checkSourcePath(const Path& path_) {
"access to path '%1%' is forbidden in restricted mode", abspath);
/* Resolve symlinks. */
debug(format("checking access to '%s'") % abspath);
DLOG(INFO) << "checking access to '" << abspath << "'";
Path path = canonPath(abspath, true);
for (auto& i : *allowedPaths) {
@ -689,7 +690,7 @@ void EvalState::evalFile(const Path& path_, Value& v) {
return;
}
printTalkative("evaluating file '%1%'", path2);
DLOG(INFO) << "evaluating file '" << path2 << "'";
Expr* e = nullptr;
auto j = fileParseCache.find(path2);
@ -1530,8 +1531,7 @@ string EvalState::copyPathToStore(PathSet& context, const Path& path) {
: store->addToStore(baseNameOf(path), checkSourcePath(path), true,
htSHA256, defaultPathFilter, repair);
srcToStore[path] = dstPath;
printMsg(lvlChatty,
format("copied source '%1%' -> '%2%'") % path % dstPath);
DLOG(INFO) << "copied source '" << path << "' -> '" << dstPath << "'";
}
context.insert(dstPath);