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

Revert "state commit"

Browse source 
This reverts commit 619cfa9fec.
This commit is contained in:
Qyriad 2024-06-19 20:42:50 -06:00
parent 619cfa9fec
commit 6d4e54e07c
2 changed files with 56 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/libmain/progress-bar.cc
View file

@ -1,6 +1,4 @@
#include "progress-bar.hh" #include "progress-bar.hh"
#include "escape-string.hh"
#include "logging.hh"
#include "sync.hh" #include "sync.hh"
#include "store-api.hh" #include "store-api.hh"
#include "names.hh" #include "names.hh"
@ -41,14 +39,13 @@ static std::string_view storePathToName(std::string_view path)
// 100 years ought to be enough for anyone (yet sufficiently smaller than max() to not cause signed integer overflow). // 100 years ought to be enough for anyone (yet sufficiently smaller than max() to not cause signed integer overflow).
constexpr const auto A_LONG_TIME = std::chrono::duration_cast<std::chrono::milliseconds>(100 * 365 * 86400s); constexpr const auto A_LONG_TIME = std::chrono::duration_cast<std::chrono::milliseconds>(100 * 365 * 86400s);
class ProgressBar : public Logger
struct ActInfo
{ {
using TimePoint = std::chrono::time_point<std::chrono::steady_clock>; private:
std::string s; struct ActInfo
std::string lastLine; {
std::string phase; std::string s, lastLine, phase;
ActivityType type = actUnknown; ActivityType type = actUnknown;
uint64_t done = 0; uint64_t done = 0;
uint64_t expected = 0; uint64_t expected = 0;
@ -58,68 +55,32 @@ struct ActInfo
bool visible = true; bool visible = true;
ActivityId parent; ActivityId parent;
std::optional<std::string> name; std::optional<std::string> name;
TimePoint startTime; std::chrono::time_point<std::chrono::steady_clock> startTime;
std::string to_string() const
{
EscapeStringOptions escapeOptions{
.escapeNonPrinting = true,
}; };
auto const escapedS = escapeString(s, escapeOptions);
auto const escapedLastLine = escapeString(lastLine, escapeOptions);
auto const escapedPhase = escapeString(phase, escapeOptions);
auto const typeS = activityTypeToString(type);
return fmt( struct ActivitiesByType
"ActInfo {\n s = %s,\n lastLine = %s,\n phase = %s,\n type = %s,\n done = %d\n expected = %d,\n running = %d,\n failed = %d,\n parent = %d,\n name = %s,\n}", {
escapedS, std::map<ActivityId, std::list<ActInfo>::iterator> its;
escapedLastLine,
escapedPhase,
typeS,
done,
expected,
running,
failed,
parent,
name.value_or("<nullopt>")
);
}
};
using ActInfoIterator = std::list<ActInfo>::iterator;
struct ActivitiesByType
{
std::map<ActivityId, ActInfoIterator> its;
uint64_t done = 0; uint64_t done = 0;
uint64_t expected = 0; uint64_t expected = 0;
uint64_t failed = 0; uint64_t failed = 0;
}; };
struct BarState struct State
{ {
std::list<ActInfo> activities; std::list<ActInfo> activities;
std::map<ActivityId, ActInfoIterator> its; std::map<ActivityId, std::list<ActInfo>::iterator> its;
std::map<ActivityType, ActivitiesByType> activitiesByType; std::map<ActivityType, ActivitiesByType> activitiesByType;
uint64_t filesLinked = 0; uint64_t filesLinked = 0, bytesLinked = 0;
uint64_t bytesLinked = 0;
uint64_t corruptedPaths = 0; uint64_t corruptedPaths = 0, untrustedPaths = 0;
uint64_t untrustedPaths = 0;
bool active = true; bool active = true;
bool paused = false; bool paused = false;
bool haveUpdate = true; bool haveUpdate = true;
}; };
class ProgressBar : public Logger
{
private:
//using ActInfo = ActInfo;
using ActivitiesByType = ActivitiesByType;
using State = BarState;
Sync<State> state_; Sync<State> state_;
@ -454,13 +415,6 @@ public:
std::string getStatus(State & state) std::string getStatus(State & state)
{ {
constexpr auto MiB = 1024.0 * 1024.0; constexpr auto MiB = 1024.0 * 1024.0;
//this->cout("getStatus(): we have %d activities", state.activities.size());
//std::cerr << "\ngetStatus(): we have " << state.activities.size() << "\n";
if (!state.activities.empty()) {
ActInfo const & firstActivity = state.activities.front();
std::cerr << "\ngetStatus(): " << firstActivity.to_string() << "\n";
}
std::string res; std::string res;
@ -479,49 +433,21 @@ public:
std::string s; std::string s;
if (running || done || expected || failed) { if (running || done || expected || failed) {
if (running) { if (running)
if (expected != 0) { if (expected != 0)
auto const runningPart = fmt(numberFmt, running / unit); s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt,
auto const donePart = fmt(numberFmt, done / unit); running / unit, done / unit, expected / unit);
auto const expectedPart = fmt(numberFmt, expected / unit); else
s = fmt( s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL,
ANSI_BLUE "%s" ANSI_NORMAL "/" ANSI_GREEN "%s" ANSI_NORMAL "/%s", running / unit, done / unit);
runningPart, else if (expected != done)
donePart, if (expected != 0)
expectedPart s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt,
); done / unit, expected / unit);
} else { else
auto const runningPart = fmt(numberFmt, running / unit); s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL, done / unit);
auto const donePart = fmt(numberFmt, done / unit); else
s = fmt( s = fmt(done ? ANSI_GREEN + numberFmt + ANSI_NORMAL : numberFmt, done / unit);
ANSI_BLUE "%s" ANSI_NORMAL "/" ANSI_GREEN "%s" ANSI_NORMAL,
runningPart,
donePart
);
}
} else if (expected != done) {
if (expected != 0) {
auto const donePart = fmt(numberFmt, done / unit);
auto const expectedPart = fmt(numberFmt, expected / unit);
s = fmt(
ANSI_GREEN "%s" ANSI_NORMAL "/%s",
donePart,
expectedPart
);
} else {
auto const donePart = fmt(numberFmt, done / unit);
s = fmt(ANSI_GREEN "%s" ANSI_NORMAL, donePart);
}
} else {
auto const donePart = fmt(numberFmt, done / unit);
// We only color if `done` is non-zero.
if (done) {
s = concatStrings(ANSI_GREEN, donePart, ANSI_NORMAL);
} else {
s = donePart;
}
}
s = fmt(itemFmt, s); s = fmt(itemFmt, s);
if (failed) if (failed)
@ -532,10 +458,10 @@ public:
}; };
auto showActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) { auto showActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
auto rendered = renderActivity(type, itemFmt, numberFmt, unit); auto s = renderActivity(type, itemFmt, numberFmt, unit);
if (rendered.empty()) return; if (s.empty()) return;
if (!res.empty()) res += ", "; if (!res.empty()) res += ", ";
res += rendered; res += s;
}; };
showActivity(actBuilds, "%s built"); showActivity(actBuilds, "%s built");

32
src/libutil/logging.hh
View file

@ -23,38 +23,6 @@ typedef enum {
actBuildWaiting = 111, actBuildWaiting = 111,
} ActivityType; } ActivityType;
constexpr std::string_view activityTypeToString(ActivityType const & actType)
{
switch (actType) {
case actUnknown:
return "Unknown";
case actCopyPath:
return "CopyPath";
case actFileTransfer:
return "FileTransfer";
case actRealise:
return "Realise";
case actCopyPaths:
return "CopyPaths";
case actBuilds:
return "Builds";
case actBuild:
return "Build";
case actOptimiseStore:
return "OptimiseStore";
case actVerifyPaths:
return "VerifyPaths";
case actSubstitute:
return "Substitute";
case actQueryPathInfo:
return "QueryPathInfo";
case actPostBuildHook:
return "PostBuildHook";
case actBuildWaiting:
return "BuildWaiting";
}
}
typedef enum { typedef enum {
resFileLinked = 100, resFileLinked = 100,
resBuildLogLine = 101, resBuildLogLine = 101,