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

Restore activity metadata

Browse source 
This allows the progress bar to display "building perl-5.22.3" instead
of "building /nix/store/<hash>-perl-5.22.3.drv".
This commit is contained in:
Eelco Dolstra 2017-08-25 14:53:50 +02:00
parent 1f56235438
commit 0e9ddcc306
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -1390,7 +1390,8 @@ void DerivationGoal::tryToBuild()
bool buildLocally = buildMode != bmNormal || drv->willBuildLocally();
auto started = [&]() {
act = std::make_unique<Activity>(*logger, actBuild, fmt("building '%s'", drvPath));
act = std::make_unique<Activity>(*logger, actBuild,
fmt("building '%s'", drvPath), Logger::Fields{drvPath});
mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds);
worker.updateProgress();
};
@ -2405,13 +2406,15 @@ struct BuilderLogger : Logger
prevLogger.log(lvl, fs);
}
void startActivity(ActivityId act, ActivityType type, const std::string & s) override
void startActivity(ActivityId act, ActivityType type,
const std::string & s, const Fields & fields) override
{
nlohmann::json json;
json["action"] = "start";
json["id"] = act;
json["type"] = type;
json["text"] = s;
// FIXME: handle fields
log(lvlError, "@nix " + json.dump());
}

5
src/libutil/logging.cc
View file

@ -74,10 +74,11 @@ Logger * makeDefaultLogger()
std::atomic<uint64_t> nextId{(uint64_t) getpid() << 32};
Activity::Activity(Logger & logger, ActivityType type, const std::string & s)
Activity::Activity(Logger & logger, ActivityType type,
const std::string & s, const Logger::Fields & fields)
: logger(logger), id(nextId++)
{
logger.startActivity(id, type, s);
logger.startActivity(id, type, s, fields);
}
}

48
src/libutil/logging.hh
View file

@ -40,25 +40,6 @@ class Logger
public:
virtual ~Logger() { }
virtual void log(Verbosity lvl, const FormatOrString & fs) = 0;
void log(const FormatOrString & fs)
{
log(lvlInfo, fs);
}
virtual void warn(const std::string & msg);
virtual void startActivity(ActivityId act, ActivityType type, const std::string & s) { };
virtual void stopActivity(ActivityId act) { };
virtual void progress(ActivityId act, uint64_t done = 0, uint64_t expected = 0, uint64_t running = 0, uint64_t failed = 0) { };
virtual void setExpected(ActivityId act, ActivityType type, uint64_t expected) { };
struct Field
{
// FIXME: use std::variant.
@ -70,7 +51,29 @@ public:
Field(const uint64_t & i) : type(tInt), i(i) { }
};
virtual void result(ActivityId act, ResultType type, const std::vector<Field> & fields) { };
typedef std::vector<Field> Fields;
virtual ~Logger() { }
virtual void log(Verbosity lvl, const FormatOrString & fs) = 0;
void log(const FormatOrString & fs)
{
log(lvlInfo, fs);
}
virtual void warn(const std::string & msg);
virtual void startActivity(ActivityId act, ActivityType type,
const std::string & s, const Fields & fields) { };
virtual void stopActivity(ActivityId act) { };
virtual void progress(ActivityId act, uint64_t done = 0, uint64_t expected = 0, uint64_t running = 0, uint64_t failed = 0) { };
virtual void setExpected(ActivityId act, ActivityType type, uint64_t expected) { };
virtual void result(ActivityId act, ResultType type, const Fields & fields) { };
};
struct Activity
@ -79,7 +82,8 @@ struct Activity
const ActivityId id;
Activity(Logger & logger, ActivityType type, const std::string & s = "");
Activity(Logger & logger, ActivityType type, const std::string & s = "",
const Logger::Fields & fields = {});
Activity(const Activity & act) = delete;
@ -95,7 +99,7 @@ struct Activity
template<typename... Args>
void result(ResultType type, const Args & ... args)
{
std::vector<Logger::Field> fields;
Logger::Fields fields;
nop{(fields.emplace_back(Logger::Field(args)), 1)...};
logger.result(id, type, fields);
}

10
src/nix/progress-bar.cc
View file

@ -93,7 +93,8 @@ public:
update(state);
}
void startActivity(ActivityId act, ActivityType type, const std::string & s) override
void startActivity(ActivityId act, ActivityType type, const std::string & s,
const Fields & fields) override
{
auto state(state_.lock());
@ -102,6 +103,13 @@ public:
state->its.emplace(act, i);
state->activitiesByType[type].its.emplace(act, i);
if (type == actBuild) {
auto name = storePathToName(getS(fields, 0));
if (hasSuffix(name, ".drv"))
name.resize(name.size() - 4);
i->s = fmt("building " ANSI_BOLD "%s" ANSI_NORMAL, name);
}
update(*state);
}