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

Fix data race in copyPaths

Browse source
This commit is contained in:
Patrick Jackson 2023-03-30 16:58:07 -07:00
parent 06d87b95bc
commit 309753ebb5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include "archive.hh" #include "archive.hh"
#include "callback.hh" #include "callback.hh"
#include "remote-store.hh" #include "remote-store.hh"
#include "sync.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <regex> #include <regex>
@ -1101,7 +1102,8 @@ std::map<StorePath, StorePath> copyPaths(
return storePathForDst; return storePathForDst;
}; };
uint64_t total = 0; // total is accessed by each copy, which are each handled in separate threads
Sync<uint64_t> total = 0;
for (auto & missingPath : sortedMissing) { for (auto & missingPath : sortedMissing) {
auto info = srcStore.queryPathInfo(missingPath); auto info = srcStore.queryPathInfo(missingPath);
@ -1124,8 +1126,8 @@ std::map<StorePath, StorePath> copyPaths(
PushActivity pact(act.id); PushActivity pact(act.id);
LambdaSink progressSink([&](std::string_view data) { LambdaSink progressSink([&](std::string_view data) {
total += data.size(); *total.lock() += data.size();
act.progress(total, info->narSize); act.progress(*total.lock(), info->narSize);
}); });
TeeSink tee { sink, progressSink }; TeeSink tee { sink, progressSink };