From 9945bd174671c6f90ee9b9eafabbf8e717042c7e Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sun, 22 Nov 2020 17:11:32 -0500 Subject: feat(tvix): Convert some DLOGs to VLOGs It seems like the amount of logging is causing things to move a little slower - even if that's not really the case, it gets in the way of debugging things. Refs: b/76 Change-Id: I9ea99a3b16e3307a0b0371bad22d03b0e2175af6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2134 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/nix/src/libexpr/eval.cc | 4 ++-- third_party/nix/src/libexpr/parser.cc | 4 ++-- third_party/nix/src/libexpr/primops.cc | 2 +- third_party/nix/src/libexpr/primops/fetchGit.cc | 2 +- third_party/nix/src/libstore/download.cc | 2 +- third_party/nix/src/libstore/pathlocks.cc | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'third_party') diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc index e15741811738..f7b745a7b480 100644 --- a/third_party/nix/src/libexpr/eval.cc +++ b/third_party/nix/src/libexpr/eval.cc @@ -688,7 +688,7 @@ void EvalState::evalFile(const Path& path_, Value& v) { return; } - DLOG(INFO) << "evaluating file '" << path2 << "'"; + VLOG(2) << "evaluating file '" << path2 << "'"; Expr* e = nullptr; auto j = fileParseCache.find(path2); @@ -1541,7 +1541,7 @@ std::string EvalState::copyPathToStore(PathSet& context, const Path& path) { : store->addToStore(baseNameOf(path), checkSourcePath(path), true, htSHA256, defaultPathFilter, repair); srcToStore[path] = dstPath; - DLOG(INFO) << "copied source '" << path << "' -> '" << dstPath << "'"; + VLOG(2) << "copied source '" << path << "' -> '" << dstPath << "'"; } context.insert(dstPath); diff --git a/third_party/nix/src/libexpr/parser.cc b/third_party/nix/src/libexpr/parser.cc index 756fdfa12819..aea6cec7e445 100644 --- a/third_party/nix/src/libexpr/parser.cc +++ b/third_party/nix/src/libexpr/parser.cc @@ -322,8 +322,8 @@ std::pair EvalState::resolveSearchPathElem( } } - DLOG(INFO) << "resolved search path element '" << elem.second << "' to '" - << res.second << "'"; + VLOG(2) << "resolved search path element '" << elem.second << "' to '" + << res.second << "'"; searchPathResolved[elem.second] = res; return res; diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 5278734dcb6c..0bac7793c7e1 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -745,7 +745,7 @@ static void prim_derivationStrict(EvalState& state, const Pos& pos, /* Write the resulting term into the Nix store directory. */ Path drvPath = writeDerivation(state.store, drv, drvName, state.repair); - DLOG(INFO) << "instantiated '" << drvName << "' -> '" << drvPath << "'"; + VLOG(2) << "instantiated '" << drvName << "' -> '" << drvPath << "'"; /* Optimisation, but required in read-only mode! because in that case we don't actually write store derivations, so we can't diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc index 72b498d30b3e..da4d683401d7 100644 --- a/third_party/nix/src/libexpr/primops/fetchGit.cc +++ b/third_party/nix/src/libexpr/primops/fetchGit.cc @@ -160,7 +160,7 @@ GitInfo exportGit(ref store, const std::string& uri, : absl::StripTrailingAsciiWhitespace(readFile(localRefFile)); gitInfo.shortRev = std::string(gitInfo.rev, 0, 7); - DLOG(INFO) << "using revision " << gitInfo.rev << " of repo '" << uri << "'"; + VLOG(2) << "using revision " << gitInfo.rev << " of repo '" << uri << "'"; std::string storeLinkName = hashString(htSHA512, name + std::string("\0"s) + gitInfo.rev) diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc index a2eed7ced8e3..fd472713e6a7 100644 --- a/third_party/nix/src/libstore/download.cc +++ b/third_party/nix/src/libstore/download.cc @@ -588,7 +588,7 @@ struct CurlDownloader : public Downloader { nextWakeup - std::chrono::steady_clock::now()) .count())) : maxSleepTimeMs; - DLOG(INFO) << "download thread waiting for " << sleepTimeMs << " ms"; + VLOG(2) << "download thread waiting for " << sleepTimeMs << " ms"; mc = curl_multi_wait(curlm, extraFDs, 1, sleepTimeMs, &numfds); if (mc != CURLM_OK) { throw nix::Error(format("unexpected error from curl_multi_wait(): %s") % diff --git a/third_party/nix/src/libstore/pathlocks.cc b/third_party/nix/src/libstore/pathlocks.cc index 8a874adbe913..09dec08c458c 100644 --- a/third_party/nix/src/libstore/pathlocks.cc +++ b/third_party/nix/src/libstore/pathlocks.cc @@ -92,7 +92,7 @@ bool PathLocks::lockPaths(const PathSet& paths, const std::string& waitMsg, checkInterrupt(); Path lockPath = path + ".lock"; - DLOG(INFO) << "locking path '" << path << "'"; + VLOG(2) << "locking path '" << path << "'"; AutoCloseFD fd; @@ -115,7 +115,7 @@ bool PathLocks::lockPaths(const PathSet& paths, const std::string& waitMsg, } } - DLOG(INFO) << "lock acquired on '" << lockPath << "'"; + VLOG(2) << "lock acquired on '" << lockPath << "'"; /* Check that the lock file hasn't become stale (i.e., hasn't been unlinked). */ @@ -159,7 +159,7 @@ void PathLocks::unlock() { LOG(WARNING) << "cannot close lock file on '" << i.second << "'"; } - DLOG(INFO) << "lock released on '" << i.second << "'"; + VLOG(2) << "lock released on '" << i.second << "'"; } fds.clear(); -- cgit 1.4.1