wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 21:51:50 +02:00
Code Activity

Allow activities to be nested

Browse source 
In particular, this allows more relevant activities ("substituting X")
to supersede inferior ones ("downloading X").
This commit is contained in:
Eelco Dolstra 2017-08-25 17:49:40 +02:00
parent f194629f96
commit c137c0a5eb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/logging.cc
View file

@ -5,6 +5,8 @@
namespace nix {
thread_local ActivityId curActivity = 0;
Logger * logger = makeDefaultLogger();
void Logger::warn(const std::string & msg)
@ -75,10 +77,10 @@ Logger * makeDefaultLogger()
std::atomic<uint64_t> nextId{(uint64_t) getpid() << 32};
Activity::Activity(Logger & logger, ActivityType type,
const std::string & s, const Logger::Fields & fields)
const std::string & s, const Logger::Fields & fields, ActivityId parent)
: logger(logger), id(nextId++)
{
logger.startActivity(id, type, s, fields);
logger.startActivity(id, type, s, fields, parent);
}
}

14
src/libutil/logging.hh
View file

@ -23,6 +23,7 @@ typedef enum {
actBuild = 105,
actOptimiseStore = 106,
actVerifyPaths = 107,
actSubstitute = 108,
} ActivityType;
typedef enum {
@ -65,7 +66,7 @@ public:
virtual void warn(const std::string & msg);
virtual void startActivity(ActivityId act, ActivityType type,
const std::string & s, const Fields & fields) { };
const std::string & s, const Fields & fields, ActivityId parent) { };
virtual void stopActivity(ActivityId act) { };
@ -76,6 +77,8 @@ public:
virtual void result(ActivityId act, ResultType type, const Fields & fields) { };
};
extern thread_local ActivityId curActivity;
struct Activity
{
Logger & logger;
@ -83,7 +86,7 @@ struct Activity
const ActivityId id;
Activity(Logger & logger, ActivityType type, const std::string & s = "",
const Logger::Fields & fields = {});
const Logger::Fields & fields = {}, ActivityId parent = curActivity);
Activity(const Activity & act) = delete;
@ -107,6 +110,13 @@ struct Activity
friend class Logger;
};
struct PushActivity
{
const ActivityId prevAct;
PushActivity(ActivityId act) : prevAct(curActivity) { curActivity = act; }
~PushActivity() { curActivity = prevAct; }
};
extern Logger * logger;
Logger * makeDefaultLogger();