ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove TokenServer in preparation of making NAR copying O(1) memory

Browse Source
This commit is contained in:
Eelco Dolstra
2020-07-27 14:57:16 +02:00
parent e5f6fc2e4e
commit cbcf6359b4
6 changed files with 1 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/hydra-queue-runner/state.hh
View File

@ -8,7 +8,6 @@
#include <queue>
#include "db.hh"
#include "token-server.hh"
#include "parsed-derivations.hh"
#include "pathlocks.hh"
@ -65,7 +64,6 @@ struct RemoteResult
time_t startTime = 0, stopTime = 0;
unsigned int overhead = 0;
nix::Path logFile;
std::unique_ptr<nix::TokenServer::Token> tokens;
std::shared_ptr<nix::FSAccessor> accessor;
BuildStatus buildStatus() const
@ -410,13 +408,6 @@ private:
std::shared_ptr<nix::Store> localStore;
std::shared_ptr<nix::Store> _destStore;
/* Token server to prevent threads from allocating too many big
strings concurrently while importing NARs from the build
machines. When a thread imports a NAR of size N, it will first
acquire N memory tokens, causing it to block until that many
tokens are available. */
nix::TokenServer memoryTokens;
size_t maxOutputSize;
size_t maxLogSize;