vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Keep per-machine stats

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-22 17:11:17 +02:00
parent d06366e7cf
commit 5312e1209b
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -177,7 +177,10 @@ struct Machine
unsigned int maxJobs = 1; unsigned int maxJobs = 1;
float speedFactor = 1.0; float speedFactor = 1.0;
std::atomic<unsigned int> currentJobs{0}; counter currentJobs{0};
counter nrStepsDone{0};
counter totalStepTime{0}; // total time for steps, including closure copying
counter totalStepBuildTime{0}; // total build time for steps
bool supportsStep(Step::ptr step) bool supportsStep(Step::ptr step)
{ {
@ -241,6 +244,7 @@ private:
Sync<Machines> machines; Sync<Machines> machines;
/* Various stats. */ /* Various stats. */
time_t startedAt;
counter nrBuildsRead{0}; counter nrBuildsRead{0};
counter nrBuildsDone{0}; counter nrBuildsDone{0};
counter nrStepsDone{0}; counter nrStepsDone{0};
@ -1299,9 +1303,13 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
} }
// FIXME: keep stats about aborted steps?
nrStepsDone++; nrStepsDone++;
totalStepTime += stepStopTime - stepStartTime; totalStepTime += stepStopTime - stepStartTime;
totalStepBuildTime += result.stopTime - result.startTime; totalStepBuildTime += result.stopTime - result.startTime;
machine->nrStepsDone++;
machine->totalStepTime += stepStopTime - stepStartTime;
machine->totalStepBuildTime += result.stopTime - result.startTime;
return false; return false;
} }
@ -1423,8 +1431,10 @@ void State::dumpStatus(Connection & conn, bool log)
{ {
JSONObject root(out); JSONObject root(out);
time_t now = time(0);
root.attr("status", "up"); root.attr("status", "up");
root.attr("time", time(0)); root.attr("time", time(0));
root.attr("uptime", now - startedAt);
root.attr("pid", getpid()); root.attr("pid", getpid());
{ {
auto builds_(builds.lock()); auto builds_(builds.lock());
@ -1449,9 +1459,9 @@ void State::dumpStatus(Connection & conn, bool log)
root.attr("nrStepsDone", nrStepsDone); root.attr("nrStepsDone", nrStepsDone);
root.attr("nrRetries", nrRetries); root.attr("nrRetries", nrRetries);
root.attr("maxNrRetries", maxNrRetries); root.attr("maxNrRetries", maxNrRetries);
if (nrStepsDone) {
root.attr("totalStepTime", totalStepTime); root.attr("totalStepTime", totalStepTime);
root.attr("totalStepBuildTime", totalStepBuildTime); root.attr("totalStepBuildTime", totalStepBuildTime);
if (nrStepsDone) {
root.attr("avgStepTime"); out << (float) totalStepTime / nrStepsDone; root.attr("avgStepTime"); out << (float) totalStepTime / nrStepsDone;
root.attr("avgStepBuildTime"); out << (float) totalStepBuildTime / nrStepsDone; root.attr("avgStepBuildTime"); out << (float) totalStepBuildTime / nrStepsDone;
} }
@ -1466,7 +1476,13 @@ void State::dumpStatus(Connection & conn, bool log)
nested.attr(m->sshName); nested.attr(m->sshName);
JSONObject nested2(out); JSONObject nested2(out);
nested2.attr("currentJobs", m->currentJobs); nested2.attr("currentJobs", m->currentJobs);
nested2.attr("maxJobs", m->maxJobs); nested2.attr("nrStepsDone", m->nrStepsDone);
if (m->nrStepsDone) {
nested2.attr("totalStepTime", m->totalStepTime);
nested2.attr("totalStepBuildTime", m->totalStepBuildTime);
nested2.attr("avgStepTime"); out << (float) m->totalStepTime / m->nrStepsDone;
nested2.attr("avgStepBuildTime"); out << (float) m->totalStepBuildTime / m->nrStepsDone;
}
} }
} }
} }
@ -1550,6 +1566,8 @@ void State::unlock()
void State::run() void State::run()
{ {
startedAt = time(0);
auto lock = acquireGlobalLock(); auto lock = acquireGlobalLock();
if (!lock) if (!lock)
throw Error("hydra-queue-runner is already running"); throw Error("hydra-queue-runner is already running");