maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

9
src/libstore/build.cc
View file

@ -2407,14 +2407,14 @@ struct BuilderLogger : Logger
}
void startActivity(ActivityId act, ActivityType type,
const std::string & s, const Fields & fields) override
const std::string & s, const Fields & fields, ActivityId parent) override
{
nlohmann::json json;
json["action"] = "start";
json["id"] = act;
json["type"] = type;
json["text"] = s;
// FIXME: handle fields
// FIXME: handle fields, parent
log(lvlError, "@nix " + json.dump());
}
@ -3313,7 +3313,7 @@ void DerivationGoal::flushLine()
if (type == actDownload)
builderActivities.emplace(std::piecewise_construct,
std::forward_as_tuple(json["id"]),
std::forward_as_tuple(*logger, type, json["text"]));
std::forward_as_tuple(*logger, type, json["text"], Logger::Fields{}, act->id));
}
else if (action == "stop")
@ -3655,6 +3655,9 @@ void SubstitutionGoal::tryToRun()
/* Wake up the worker loop when we're done. */
Finally updateStats([this]() { outPipe.writeSide = -1; });
Activity act(*logger, actSubstitute, "", Logger::Fields{storePath, sub->getUri()});
PushActivity pact(act.id);
copyStorePath(ref<Store>(sub), ref<Store>(worker.store.shared_from_this()),
storePath, repair);

2
src/libstore/download.cc
View file

@ -85,7 +85,7 @@ struct CurlDownloader : public Downloader
DownloadItem(CurlDownloader & downloader, const DownloadRequest & request)
: downloader(downloader)
, request(request)
, act(*logger, actDownload, fmt("downloading '%s'", request.uri))
, act(*logger, actDownload, fmt("downloading '%s'", request.uri), {}, request.parentAct)
{
if (!request.expectedETag.empty())
requestHeaders = curl_slist_append(requestHeaders, ("If-None-Match: " + request.expectedETag).c_str());

4
src/libstore/download.hh
View file

@ -16,8 +16,10 @@ struct DownloadRequest
bool head = false;
size_t tries = 5;
unsigned int baseRetryTimeMs = 250;
ActivityId parentAct;
DownloadRequest(const std::string & uri) : uri(uri) { }
DownloadRequest(const std::string & uri)
: uri(uri), parentAct(curActivity) { }
};
struct DownloadResult

4
src/libstore/store-api.cc
View file

@ -565,7 +565,9 @@ void Store::buildPaths(const PathSet & paths, BuildMode buildMode)
void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
const Path & storePath, RepairFlag repair, CheckSigsFlag checkSigs)
{
Activity act(*logger, actCopyPath, fmt("copying path '%s'", storePath));
Activity act(*logger, actCopyPath, fmt("copying path '%s'", storePath),
{storePath, srcStore->getUri(), dstStore->getUri()});
PushActivity pact(act.id);
auto info = srcStore->queryPathInfo(storePath);