max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 23:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11149 from hercules-ci/gc-stats

Browse source 
libexpr: Track and show GC time and cycle number
This commit is contained in:
Eelco Dolstra 2024-07-22 15:39:50 +02:00 committed by GitHub
commit 3ef72040bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/eval-gc.cc
View file

@ -155,6 +155,10 @@ static inline void initGCReal()
there. */
GC_set_no_dls(1);
/* Enable perf measurements. This is just a setting; not much of a
start of something. */
GC_start_performance_measurement();
GC_INIT();
GC_set_oom_fn(oomHandler);
@ -205,6 +209,7 @@ static inline void initGCReal()
#endif
static bool gcInitialised = false;
static GC_word gcCyclesAfterInit = 0;
void initGC()
{
@ -216,6 +221,7 @@ void initGC()
#endif
gcInitialised = true;
gcCyclesAfterInit = GC_get_gc_no();
}
void assertGCInitialized()
@ -223,4 +229,10 @@ void assertGCInitialized()
assert(gcInitialised);
}
size_t getGCCycles()
{
assertGCInitialized();
return GC_get_gc_no() - gcCyclesAfterInit;
}
} // namespace nix

7
src/libexpr/eval-gc.hh
View file

@ -1,6 +1,8 @@
#pragma once
///@file
#include <cstddef>
namespace nix {
/**
@ -13,4 +15,9 @@ void initGC();
*/
void assertGCInitialized();
/**
* The number of GC cycles since initGC().
*/
size_t getGCCycles();
}

13
src/libexpr/eval.cc
View file

@ -2610,6 +2610,11 @@ void EvalState::printStatistics()
#if HAVE_BOEHMGC
GC_word heapSize, totalBytes;
GC_get_heap_usage_safe(&heapSize, 0, 0, 0, &totalBytes);
double gcFullOnlyTime = ({
auto ms = GC_get_full_gc_total_time();
ms * 0.001;
});
auto gcCycles = getGCCycles();
#endif
auto outPath = getEnv("NIX_SHOW_STATS_PATH").value_or("-");
@ -2620,6 +2625,13 @@ void EvalState::printStatistics()
#ifndef _WIN32 // TODO implement
topObj["cpuTime"] = cpuTime;
#endif
topObj["time"] = {
{"cpu", cpuTime},
#ifdef HAVE_BOEHMGC
{GC_is_incremental_mode() ? "gcNonIncremental" : "gc", gcFullOnlyTime},
{GC_is_incremental_mode() ? "gcNonIncrementalFraction" : "gcFraction", gcFullOnlyTime / cpuTime},
#endif
};
topObj["envs"] = {
{"number", nrEnvs},
{"elements", nrValuesInEnvs},
@ -2661,6 +2673,7 @@ void EvalState::printStatistics()
topObj["gc"] = {
{"heapSize", heapSize},
{"totalBytes", totalBytes},
{"cycles", gcCycles},
};
#endif