nix search: Restore output

DeterminateSystems · Jun 13, 2024 · 3353f9a · 3353f9a
1 parent 5c6eb1a
commit 3353f9a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
@@ -2671,10 +2671,12 @@ void EvalState::maybePrintStats()
         printStatistics();
     }
 
-    printError("THUNKS AWAITED: %d", nrThunksAwaited);
-    printError("THUNKS AWAITED SLOW: %d", nrThunksAwaitedSlow);
-    printError("WAITING TIME: %d μs", usWaiting);
-    printError("MAX WAITING: %d", maxWaiting);
+    if (getEnv("NIX_SHOW_THREAD_STATS").value_or("0") != "0") {
+        printError("THUNKS AWAITED: %d", nrThunksAwaited);
+        printError("THUNKS AWAITED SLOW: %d", nrThunksAwaitedSlow);
+        printError("WAITING TIME: %d μs", usWaiting);
+        printError("MAX WAITING: %d", maxWaiting);
+    }
 }
 
 void EvalState::printStatistics()

diff --git a/src/libexpr/parallel-eval.hh b/src/libexpr/parallel-eval.hh
@@ -42,7 +42,7 @@ struct Executor
     Executor()
     {
         auto nrCores = string2Int<size_t>(getEnv("NR_CORES").value_or("1")).value_or(1);
-        printError("USING %d THREADS", nrCores);
+        debug("executor using %d threads", nrCores);
         auto state(state_.lock());
         for (size_t n = 0; n < nrCores; ++n)
             state->threads.push_back(std::thread([&]()
@@ -66,7 +66,7 @@ struct Executor
             auto state(state_.lock());
             state->quit = true;
             std::swap(threads, state->threads);
-            printError("%d ITEMS LEFT", state->queue.size());
+            debug("executor shutting down with %d items left", state->queue.size());
         }
 
         wakeup.notify_all();
@@ -91,7 +91,6 @@ struct Executor
                 state.wait(wakeup);
             }
 
-            //printError("EXEC");
             try {
                 item.work();
                 item.promise.set_value();

diff --git a/src/nix/search.cc b/src/nix/search.cc
@@ -190,16 +190,14 @@ struct CmdSearch : InstallableValueCommand, MixJSON
                             };
                         } else {
                             auto name2 = hiliteMatches(name.name, nameMatches, ANSI_GREEN, "\e[0;2m");
-                            #if 0
-                            if (results > 1) logger->cout("");
-                            logger->cout(
-                                "* %s%s",
+                            auto out = fmt(
+                                "%s* %s%s",
+                                results > 1 ? "\n" : "",
                                 wrap("\e[0;1m", hiliteMatches(attrPath2, attrPathMatches, ANSI_GREEN, "\e[0;1m")),
                                 name.version != "" ? " (" + name.version + ")" : "");
                             if (description != "")
-                                logger->cout(
-                                    "  %s", hiliteMatches(description, descriptionMatches, ANSI_GREEN, ANSI_NORMAL));
-                            #endif
+                                out += fmt("\n  %s", hiliteMatches(description, descriptionMatches, ANSI_GREEN, ANSI_NORMAL));
+                            logger->cout(out);
                         }
                     }
                 }
@@ -242,7 +240,7 @@ struct CmdSearch : InstallableValueCommand, MixJSON
                 auto state(state_.lock());
                 std::swap(futures, state->futures);
             }
-            printError("GOT %d FUTURES", futures.size());
+            debug("got %d futures", futures.size());
             if (futures.empty())
                 break;
             for (auto & future : futures)