{"header":{"message":"Sync with Nix","description":null,"timestamp":"2016-02-24T13:04:31Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"B2L4T3X63XVYJQXEDU4WT5Y4R6PMDXGC6WN2KGOMHRQILSABNQOAC","authors":[],"deps":{"hashes":[["B2L4T3X63XVYJQXEDU4WT5Y4R6PMDXGC6WN2KGOMHRQILSABNQOAC","Sync with Nix"],["AA",null],["RKW3XA4UGUXX6L4JPA2ZLDFEF2RS6MZYR6C2GK23SYTRWMUADV3QC","Fix potential race in dispatcher wakeup"],["Y5LMEC35PNQJUPCREJFYK2K2OE7NQ5XVGIMH43JTU36LLCYI7SOQC","BinaryCacheStore: Respect build-use-substitutes"],["V2UCCYN3B6266BDKGSXQDRSW4HKY673GINM3VI3MORXZ7OYDJBXAC","hydra-queue-runner: Get store mode configuration from hydra.conf"],["GH4S4AWM2RUS3RUDU4E4TVQJF3N3LKM7OQQSZTG6H7NNMH6FKR7AC","Rename file"],["O3NM62IZE5EMW4KY56TV53BUZZL2NHAC55W7NBPTD7A4CKT4CHUQC","Support multiple machines files"],["QSBS2ISOQ2ZFYZIAZPWD26UYFSWIFWR47R5WUEJKIQJKKJWXOZDAC","S3BinaryCacheStore::isValidPath(): Do a GET instead of HEAD"],["YZAI5GQU3HNMK5MEGF2Y7WS445AN4YKD3HNJQVQP545ODN3F5DLAC","Implement a database connection pool"],["GTUZLZRHJ6GL5BNXOO3GA6Y3GFO7AXLIVPQHSG26LCF42KC2N7LQC","Add an S3-backed binary cache store"],["CNLNT3T4IXU42GAC64CU5CEDTDLM2SHSJZEVHTMOCWYFXSQNC76QC","Allow only 1 thread to send a closure to a given machine at the same time"],["ACBS7C6QGXAMPLQ336WAQMMGLZXBDNNYPE26ZBPUQ24GL4BF643AC","hydra-queue-runner: Detect changes to the scheduling shares"],["DWFTK56EAGNPSKWWWY5MFPATQWO5PZGHF5D53JOEJ2DG5NLLYRBQC","Keep track of how many threads are waiting"],["N2NKSKHSFR6SDMGZO2ALNDVIOLOEE26BPQHCSWUGEFE3DVVVV4MAC","Refactor local binary cache code into a subclass"],["HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC","Refactor"],["RND7XFNHXVORJ6JPEHGS7PCIW7DMOTWMZQPTEMXWLR7CZUQ2VCQQC","getQueuedBuilds(): Periodically stop to handle priority bumps"],["32HHP5CWAWJB2Q3Q6HYEC66YFGQAV6ESU7VEQ5ENBAQ5ZCRP4KGAC","hydra-queue-runner: Support generating a signed binary cache"],["TTBLPQAJKPRC6W23QIFTPI2MM4VYR3D3CR6F7U53WU5GJDAYJW4AC","Keep track of wait time per system type"],["N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC","Move buildRemote() into State"],["7LB6QBXYOGU43UDLJDJQZFGT4XDALULXDF3WX3WWHL7X3JTB54CQC","Keep track of the number of build steps that are being built"],["MB3TISH2KYBIGY6XJKMN4HO2S6TCN2GORJENMECCKLXGGIRS2O2AC","Rate-limit the number of threads copying closures at the same time"],["73YR46NJNYZQKHA3QDJCAZYAKC2CGEF5LIS44NOIPDZU6FX6BDPQC","hydra-queue-runner: Write directly to a binary cache"],["HPJKBFZ4C24DNBFESAVVFHOBHXOPYOP4XNPFVGOLA7EPLZCIRS6QC","Handle concurrent finishing of the same build"],["46ADBTMQAHQAPW3OCI24F4I5DVK5N5QVHUA4TQVB6HFN337CHAVQC","Start steps in order of ascending build ID"],["MHVIT4JYWUYD4UCGB2AHLXWLX6B5SYE22BREERNGANT7RGGDUFOAC","Split hydra-queue-runner.cc more"],["XLYHZUHTGM3HJBIINHPY4JLMENBFXPQEZYNEXENUOX3C47JLXJMAC","Cache .narinfo lookups"],["YR2IM6Y5XA6XDFBWJUFSVNMQQKLIW6A2LDS4F77A3OZLEMBACCRAC","Temporarily disable machines after a connection failure"],["5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","Basic remote building"],["W2AOTSS6ZFJZBF3IZKWFXHFW5H4DNGLWCEDJTLMFWVAXL46SNM7QC","Rename class"],["K5G5GZY7D7KWVR5RAGZFHH3ZPG5OCLZT4HZ6XIJJ7YYVUMC2CTZQC","Guard against concurrent invocations of hydra-queue-runner"],["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","Start of single-process hydra-queue-runner"],["ENXUSMSVOU3AZFMH2ZXR4ZVPV2LRRQYQJ6IFX33YN6IH2ORSNSAAC","Make concurrency more robust"],["EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC","Use a single BinaryCacheStore for all threads"],["SOB276BAWH23OUKJUXGDWCLDIM2OISD5NKF743NTQ3L572L4BS3QC","Keep some statistics for the binary cache stores"],["ATJ54SPXPE2IIFRERUOBFF42HBSEADP4QOI743ZBUNBQX3PYKRXQC","Use PostgreSQL notifications for queue events"],["IK2UBDAU6QKUXHJG3SXJKYGIIXRDKI6UVRTFC6ZVDXDCGNCMEWVAC","Revive jobset scheduling"],["OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC","Namespace cleanup"],["GJV2J5HXFKVF7BXNFMTI6ZZMYADXIKTFIQJ3FONJ7DPVCUJZ2L4AC","Pool local store connections"],["EYR3EW6JVHNVLXMI57FUVPHQAHPETBML4H44OGJFHUT54KTTHIGQC","Keep stats for the Hydra auto scaler"]],"deps":["RKW3XA4UGUXX6L4JPA2ZLDFEF2RS6MZYR6C2GK23SYTRWMUADV3QC","Y5LMEC35PNQJUPCREJFYK2K2OE7NQ5XVGIMH43JTU36LLCYI7SOQC","V2UCCYN3B6266BDKGSXQDRSW4HKY673GINM3VI3MORXZ7OYDJBXAC"],"known":["24BMQDZAWDQ7VNIA7TIROXSOYLOJBNZ2E4264WHWNJAEN6ZB3UOAC","ENXUSMSVOU3AZFMH2ZXR4ZVPV2LRRQYQJ6IFX33YN6IH2ORSNSAAC","YZAI5GQU3HNMK5MEGF2Y7WS445AN4YKD3HNJQVQP545ODN3F5DLAC","5AIYUMTBY6TFQTBRP3MJ2PYWUMRF57I77NIVWYE74UMEVQMBWZVQC","ATJ54SPXPE2IIFRERUOBFF42HBSEADP4QOI743ZBUNBQX3PYKRXQC","HPJKBFZ4C24DNBFESAVVFHOBHXOPYOP4XNPFVGOLA7EPLZCIRS6QC","7LB6QBXYOGU43UDLJDJQZFGT4XDALULXDF3WX3WWHL7X3JTB54CQC","K5G5GZY7D7KWVR5RAGZFHH3ZPG5OCLZT4HZ6XIJJ7YYVUMC2CTZQC","MB3TISH2KYBIGY6XJKMN4HO2S6TCN2GORJENMECCKLXGGIRS2O2AC","HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC","N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC","OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC","CNLNT3T4IXU42GAC64CU5CEDTDLM2SHSJZEVHTMOCWYFXSQNC76QC","DWFTK56EAGNPSKWWWY5MFPATQWO5PZGHF5D53JOEJ2DG5NLLYRBQC","MHVIT4JYWUYD4UCGB2AHLXWLX6B5SYE22BREERNGANT7RGGDUFOAC","YR2IM6Y5XA6XDFBWJUFSVNMQQKLIW6A2LDS4F77A3OZLEMBACCRAC","46ADBTMQAHQAPW3OCI24F4I5DVK5N5QVHUA4TQVB6HFN337CHAVQC","IK2UBDAU6QKUXHJG3SXJKYGIIXRDKI6UVRTFC6ZVDXDCGNCMEWVAC","ACBS7C6QGXAMPLQ336WAQMMGLZXBDNNYPE26ZBPUQ24GL4BF643AC","EYR3EW6JVHNVLXMI57FUVPHQAHPETBML4H44OGJFHUT54KTTHIGQC","TTBLPQAJKPRC6W23QIFTPI2MM4VYR3D3CR6F7U53WU5GJDAYJW4AC","O3NM62IZE5EMW4KY56TV53BUZZL2NHAC55W7NBPTD7A4CKT4CHUQC","RND7XFNHXVORJ6JPEHGS7PCIW7DMOTWMZQPTEMXWLR7CZUQ2VCQQC","73YR46NJNYZQKHA3QDJCAZYAKC2CGEF5LIS44NOIPDZU6FX6BDPQC","32HHP5CWAWJB2Q3Q6HYEC66YFGQAV6ESU7VEQ5ENBAQ5ZCRP4KGAC","GH4S4AWM2RUS3RUDU4E4TVQJF3N3LKM7OQQSZTG6H7NNMH6FKR7AC","W2AOTSS6ZFJZBF3IZKWFXHFW5H4DNGLWCEDJTLMFWVAXL46SNM7QC","N2NKSKHSFR6SDMGZO2ALNDVIOLOEE26BPQHCSWUGEFE3DVVVV4MAC","GTUZLZRHJ6GL5BNXOO3GA6Y3GFO7AXLIVPQHSG26LCF42KC2N7LQC","EOO4EFWD2BJCGF3ZKS2QR3XDW4WHUGH2EHSOFVK6GMI5BUBZW6QQC","SOB276BAWH23OUKJUXGDWCLDIM2OISD5NKF743NTQ3L572L4BS3QC","XLYHZUHTGM3HJBIINHPY4JLMENBFXPQEZYNEXENUOX3C47JLXJMAC","QSBS2ISOQ2ZFYZIAZPWD26UYFSWIFWR47R5WUEJKIQJKKJWXOZDAC","GJV2J5HXFKVF7BXNFMTI6ZZMYADXIKTFIQJ3FONJ7DPVCUJZ2L4AC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"pool.hh","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":187},"to":{"change":5,"start":2674,"end":2705},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":2705},"to":{"change":5,"start":889,"end":889},"introduced_by":5}],"inode":{"change":5,"pos":889}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":889},"to":{"change":5,"start":890,"end":938},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":889},"to":{"change":5,"start":938,"end":1411},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":938},"to":{"change":5,"start":938,"end":1411},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":957},"to":{"change":5,"start":1411,"end":1420},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1411},"to":{"change":5,"start":1411,"end":1420},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":981},"to":{"change":5,"start":1420,"end":1560},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1420},"to":{"change":5,"start":1420,"end":1560},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1093},"to":{"change":5,"start":1560,"end":1998},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1560},"to":{"change":5,"start":1560,"end":1998},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1998},"to":{"change":5,"start":1695,"end":1742},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1742},"to":{"change":5,"start":2039,"end":2508},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2039},"to":{"change":5,"start":2039,"end":2508},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1135},"to":{"change":5,"start":2561,"end":2673},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2561},"to":{"change":5,"start":2561,"end":2673},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2508},"to":{"change":5,"start":1094,"end":1135},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1560},"to":{"change":5,"start":982,"end":1093},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1420},"to":{"change":5,"start":958,"end":981},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1411},"to":{"change":5,"start":890,"end":957},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":938},"to":{"change":5,"start":867,"end":889},"introduced_by":5}],"inode":{"change":5,"pos":889}},"content":[{"Del":"#pragma once\n\n#include \n#include \n"},{"Del":"\n#include \"sync.hh\"\n\n/* This template class implements a simple pool manager of resources\n of some type R, such as database connections. It is used as\n follows:\n\n class Connection { ... };\n\n Pool pool;\n\n {\n auto conn(pool.get());\n conn->exec(\"select ...\");\n }\n\n Here, the Connection object referenced by ‘conn’ is automatically\n returned to the pool when ‘conn’ goes out of scope.\n*/\n\ntemplate \nclass Pool\n{\n"},{"Del":"private:\n"},{"Del":" struct State\n {\n unsigned int count = 0;\n std::list> idle;\n };\n\n Sync state;\n\npublic:\n\n"},{"Del":" class Handle\n {\n private:\n Pool & pool;\n std::shared_ptr r;\n\n friend Pool;\n\n Handle(Pool & pool, std::shared_ptr r) : pool(pool), r(r) { }\n\n public:\n Handle(Handle && h) : pool(h.pool), r(h.r) { h.r.reset(); }\n\n Handle(const Handle & l) = delete;\n\n ~Handle()\n {\n auto state_(pool.state.lock());\n if (r) state_->idle.push_back(r);\n }\n\n"},{"Del":" R * operator -> () { return r.get(); }\n"},{"Del":" R & operator * () { return *r; }\n };\n\n Handle get()\n {\n {\n auto state_(state.lock());\n if (!state_->idle.empty()) {\n auto p = state_->idle.back();\n state_->idle.pop_back();\n return Handle(*this, p);\n }\n state_->count++;\n }\n /* Note: we don't hold the lock while creating a new instance,\n because creation might take a long time. */\n"},{"Del":" }\n\n unsigned int count()\n {\n auto state_(state.lock());\n return state_->count;\n }\n};\n"},{"Del":" return Handle(*this, factory());\n"},{"Del":" Pool(const Factory & factory = []() { return std::make_shared(); })\n : factory(factory)\n { }\n\n"},{"Del":"\n Factory factory;\n\n"},{"Del":"public:\n\n typedef std::function()> Factory;\n\n"},{"Del":"#include \n"}]}},{"FileDel":{"deleted_names":[{"basename":"sync.hh","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":187},"to":{"change":5,"start":10782,"end":10813},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":10813},"to":{"change":5,"start":9720,"end":9720},"introduced_by":5}],"inode":{"change":5,"pos":9720}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9720},"to":{"change":5,"start":9721,"end":9782},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1327},"to":{"change":5,"start":9782,"end":10091},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9782},"to":{"change":5,"start":9782,"end":10091},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2881},"to":{"change":5,"start":10110,"end":10176},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10110},"to":{"change":5,"start":10110,"end":10176},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1968},"to":{"change":5,"start":10176,"end":10721},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10176},"to":{"change":5,"start":10176,"end":10721},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":2,"pos":947},"to":{"change":5,"start":10721,"end":10781},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1638},"to":{"change":5,"start":10721,"end":10781},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10721},"to":{"change":5,"start":10721,"end":10781},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10721},"to":{"change":5,"start":1328,"end":1638},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1638},"to":{"change":2,"start":664,"end":947},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10176},"to":{"change":5,"start":1910,"end":1968},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10091},"to":{"change":5,"start":2863,"end":2881},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9782},"to":{"change":5,"start":1308,"end":1327},"introduced_by":5}],"inode":{"change":5,"pos":9720}},"content":[{"Del":"#pragma once\n\n#include \n#include \n"},{"Del":"\n/* This template class ensures synchronized access to a value of type\n T. It is used as follows:\n\n struct Data { int x; ... };\n\n Sync data;\n\n {\n auto data_(data.lock());\n data_->x = 123;\n }\n\n Here, \"data\" is automatically unlocked when \"data_\" goes out of\n scope.\n*/\n\n"},{"Del":"class Sync\n{\nprivate:\n std::mutex mutex;\n T data;\n\npublic:\n\n"},{"Del":" class Lock\n {\n private:\n Sync * s;\n friend Sync;\n Lock(Sync * s) : s(s) { s->mutex.lock(); }\n public:\n Lock(Lock && l) : s(l.s) { l.s = 0; }\n Lock(const Lock & l) = delete;\n ~Lock() { if (s) s->mutex.unlock(); }\n T * operator -> () { return &s->data; }\n T & operator * () { return s->data; }\n\n /* FIXME: performance impact of condition_variable_any? */\n void wait(std::condition_variable_any & cv)\n {\n assert(s);\n cv.wait(s->mutex);\n"},{"Del":" }\n };\n\n Lock lock() { return Lock(this); }\n};\n"},{"Del":" }\n\n template\n bool wait_for(std::condition_variable_any & cv,\n const std::chrono::duration & duration,\n Predicate pred)\n {\n assert(s);\n return cv.wait_for(s->mutex, duration, pred);\n"},{"Del":" }\n\n template\n std::cv_status wait_until(std::condition_variable_any & cv,\n const std::chrono::time_point & duration)\n {\n assert(s);\n return cv.wait_until(s->mutex, duration);\n"},{"Del":" Sync() { }\n Sync(const T & data) : data(data) { }\n\n"},{"Del":"template\n"},{"Del":"#include \n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":15,"ins":{"up_context":[{"change":5,"pos":2032}],"down_context":[{"change":5,"pos":307}],"flag":"BLOCK","start":0,"end":70,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2032},"to":{"change":5,"start":0,"end":70},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":"BinaryCacheStore::BinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":"BinaryCacheStore::BinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":17,"ins":{"up_context":[{"change":5,"pos":367}],"down_context":[{"change":5,"pos":2180}],"flag":"BLOCK","start":71,"end":100,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":367},"to":{"change":5,"start":71,"end":104},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" : localStore(localStore)"}],"del_contents":[{"Del":" : storeFactory(storeFactory)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":240,"ins":{"up_context":[{"change":5,"pos":106}],"down_context":[{"change":5,"pos":8015}],"flag":"BLOCK","start":101,"end":130,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":106},"to":{"change":5,"start":106,"end":144},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" if (!localStore) return;"}],"del_contents":[{"Del":" auto localStore = storeFactory();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":243,"ins":{"up_context":[{"change":5,"pos":8053}],"down_context":[{"change":5,"pos":8104}],"flag":"BLOCK","start":131,"end":182,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8053},"to":{"change":5,"start":0,"end":54},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" if (!localStore->isValidPath(storePath)) {"}],"del_contents":[{"Del":" if (!(*localStore)->isValidPath(storePath)) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":247,"ins":{"up_context":[{"change":5,"pos":8172}],"down_context":[{"change":5,"pos":8239}],"flag":"BLOCK","start":183,"end":250,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8172},"to":{"change":5,"start":55,"end":125},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" ValidPathInfo info = localStore->queryPathInfo(storePath);"}],"del_contents":[{"Del":" ValidPathInfo info = (*localStore)->queryPathInfo(storePath);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":256,"ins":{"up_context":[{"change":3,"pos":33}],"down_context":[{"change":5,"pos":8486}],"flag":"BLOCK","start":251,"end":313,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33},"to":{"change":3,"start":33,"end":98},"introduced_by":3}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" localStore->querySubstitutablePathInfos(left, infos);"}],"del_contents":[{"Del":" (*localStore)->querySubstitutablePathInfos(left, infos);\n"}]}},{"Edit":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":261,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8569},"to":{"change":5,"start":145,"end":184},"introduced_by":5}],"inode":{"change":5,"pos":1879}}},"contents":[{"Del":" auto localStore = storeFactory();\n\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":266,"ins":{"up_context":[{"change":5,"pos":8696}],"down_context":[{"change":5,"pos":8740}],"flag":"BLOCK","start":314,"end":446,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8696},"to":{"change":5,"start":190,"end":237},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" if (!localStore)"},{"Add":" throw Error(format(\"don't know how to realise path ‘%1%’ in a binary cache\") % storePath);"}],"del_contents":[{"Del":" (*localStore)->addTempRoot(storePath);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":269,"ins":{"up_context":[{"change":5,"pos":8741}],"down_context":[{"change":5,"pos":8837}],"flag":"BLOCK","start":447,"end":491,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8741},"to":{"change":5,"start":238,"end":340},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" localStore->addTempRoot(storePath);"}],"del_contents":[{"Del":" if (!(*localStore)->isValidPath(storePath))\n (*localStore)->ensurePath(storePath);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":271,"ins":{"up_context":[{"change":5,"pos":8838}],"down_context":[{"change":5,"pos":8905}],"flag":"BLOCK","start":492,"end":588,"inode":{"change":5,"pos":1879}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8838},"to":{"change":5,"start":341,"end":411},"introduced_by":5}],"inode":{"change":5,"pos":1879}},"ins_contents":[{"Add":" if (!localStore->isValidPath(storePath))"},{"Add":" localStore->ensurePath(storePath);"}],"del_contents":[{"Del":" ValidPathInfo info = (*localStore)->queryPathInfo(storePath);\n"}]}},{"Edit":{"inode":{"change":5,"pos":1879},"path":"src/hydra-queue-runner/binary-cache-store.cc","line":274,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":8906}],"down_context":[{"change":5,"pos":8906}],"flag":"BLOCK","start":589,"end":657,"inode":{"change":5,"pos":1879}}},"contents":[{"Add":" ValidPathInfo info = localStore->queryPathInfo(storePath);"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":15,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2138},"to":{"change":5,"start":185,"end":341},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":341},"to":{"change":5,"start":432,"end":535},"introduced_by":5}],"inode":{"change":5,"pos":9253}}},"contents":[{"Del":"\n/* While BinaryCacheStore is thread-safe, LocalStore and RemoteStore\n aren't. Until they are, use a factory to produce a thread-local\n local store. */\n"},{"Del":"typedef Pool> StorePool;\ntypedef std::function StoreFactory;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":23,"ins":{"up_context":[{"change":5,"pos":9417}],"down_context":[{"change":5,"pos":620}],"flag":"BLOCK","start":658,"end":697,"inode":{"change":5,"pos":9253}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9417},"to":{"change":5,"start":392,"end":423},"introduced_by":5}],"inode":{"change":5,"pos":9253}},"ins_contents":[{"Add":" std::shared_ptr localStore;"}],"del_contents":[{"Del":" StoreFactory storeFactory;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":9253},"path":"src/hydra-queue-runner/binary-cache-store.hh","line":34,"ins":{"up_context":[{"change":5,"pos":9426}],"down_context":[{"change":5,"pos":2300}],"flag":"BLOCK","start":698,"end":754,"inode":{"change":5,"pos":9253}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9426},"to":{"change":5,"start":425,"end":481},"introduced_by":5}],"inode":{"change":5,"pos":9253}},"ins_contents":[{"Add":" BinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":" BinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Edit":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":21,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7501},"to":{"change":5,"start":536,"end":617},"introduced_by":5}],"inode":{"change":5,"pos":4840}}},"contents":[{"Del":" : localStorePool([]() { return std::make_shared>(openStore()); })\n"}]}},{"Replacement":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":48,"ins":{"up_context":[{"change":5,"pos":1546}],"down_context":[{"change":5,"pos":1580}],"flag":"BLOCK","start":755,"end":789,"inode":{"change":5,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1546},"to":{"change":5,"start":618,"end":659},"introduced_by":5}],"inode":{"change":5,"pos":4840}},"ins_contents":[{"Add":"ref State::getLocalStore()"}],"del_contents":[{"Del":"StorePool::Handle State::getLocalStore()\n"}]}},{"Replacement":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":50,"ins":{"up_context":[{"change":5,"pos":1582}],"down_context":[{"change":5,"pos":1621}],"flag":"BLOCK","start":790,"end":826,"inode":{"change":5,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1582},"to":{"change":5,"start":660,"end":714},"introduced_by":5}],"inode":{"change":5,"pos":4840}},"ins_contents":[{"Add":" return ref(_localStore);"}],"del_contents":[{"Del":" auto conn(localStorePool.get());\n return conn;\n"}]}},{"Edit":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":748,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":609}],"down_context":[{"change":5,"pos":4619}],"flag":"BLOCK","start":827,"end":859,"inode":{"change":5,"pos":4840}}},"contents":[{"Add":""},{"Add":" _localStore = openStore();"}]}},{"Replacement":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":752,"ins":{"up_context":[{"change":4,"pos":662}],"down_context":[{"change":4,"pos":696}],"flag":"BLOCK","start":860,"end":894,"inode":{"change":5,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":662},"to":{"change":4,"start":662,"end":696},"introduced_by":4}],"inode":{"change":5,"pos":4840}},"ins_contents":[{"Add":" _destStore = _localStore;"}],"del_contents":[{"Del":" _destStore = openStore();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":760,"ins":{"up_context":[{"change":4,"pos":960}],"down_context":[{"change":4,"pos":1134}],"flag":"BLOCK","start":895,"end":1034,"inode":{"change":5,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":960},"to":{"change":4,"start":960,"end":1134},"introduced_by":4}],"inode":{"change":5,"pos":4840}},"ins_contents":[{"Add":" _localStore,"},{"Add":" hydraConfig[\"binary_cache_secret_key_file\"],"},{"Add":" hydraConfig[\"binary_cache_public_key_file\"],"}],"del_contents":[{"Del":" [this]() { return this->getLocalStore(); },\n \"/home/eelco/Misc/Keys/test.nixos.org/secret\",\n \"/home/eelco/Misc/Keys/test.nixos.org/public\",\n"}]}},{"Replacement":{"inode":{"change":5,"pos":4840},"path":"src/hydra-queue-runner/hydra-queue-runner.cc","line":773,"ins":{"up_context":[{"change":4,"pos":1527}],"down_context":[{"change":4,"pos":1583}],"flag":"BLOCK","start":1035,"end":1060,"inode":{"change":5,"pos":4840}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1527},"to":{"change":4,"start":1527,"end":1583},"introduced_by":4}],"inode":{"change":5,"pos":4840}},"ins_contents":[{"Add":" _localStore,"}],"del_contents":[{"Del":" [this]() { return this->getLocalStore(); },\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1463},"path":"src/hydra-queue-runner/local-binary-cache-store.cc","line":5,"ins":{"up_context":[{"change":5,"pos":1521}],"down_context":[{"change":5,"pos":1050}],"flag":"BLOCK","start":1061,"end":1141,"inode":{"change":5,"pos":1463}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1521},"to":{"change":5,"start":1016,"end":1096},"introduced_by":5}],"inode":{"change":5,"pos":1463}},"ins_contents":[{"Add":"LocalBinaryCacheStore::LocalBinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":"LocalBinaryCacheStore::LocalBinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1463},"path":"src/hydra-queue-runner/local-binary-cache-store.cc","line":8,"ins":{"up_context":[{"change":5,"pos":1143}],"down_context":[{"change":5,"pos":1744}],"flag":"BLOCK","start":1142,"end":1207,"inode":{"change":5,"pos":1463}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1143},"to":{"change":5,"start":1097,"end":1164},"introduced_by":5}],"inode":{"change":5,"pos":1463}},"ins_contents":[{"Add":" : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)"}],"del_contents":[{"Del":" : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":2672},"path":"src/hydra-queue-runner/local-binary-cache-store.hh","line":15,"ins":{"up_context":[{"change":5,"pos":2839}],"down_context":[{"change":5,"pos":1193}],"flag":"BLOCK","start":1208,"end":1269,"inode":{"change":5,"pos":2672}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2839},"to":{"change":5,"start":1165,"end":1226},"introduced_by":5}],"inode":{"change":5,"pos":2672}},"ins_contents":[{"Add":" LocalBinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":" LocalBinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":20067},"path":"src/hydra-queue-runner/queue-monitor.cc","line":39,"ins":{"up_context":[{"change":5,"pos":20820}],"down_context":[{"change":5,"pos":20872}],"flag":"BLOCK","start":1270,"end":1350,"inode":{"change":5,"pos":20067}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20820},"to":{"change":5,"start":1136,"end":1217},"introduced_by":5}],"inode":{"change":5,"pos":20067}},"ins_contents":[{"Add":" bool done = getQueuedBuilds(*conn, localStore, destStore, lastBuildId);"}],"del_contents":[{"Del":" bool done = getQueuedBuilds(*conn, *localStore, destStore, lastBuildId);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1297},"path":"src/hydra-queue-runner/s3-binary-cache-store.cc","line":34,"ins":{"up_context":[{"change":5,"pos":2017}],"down_context":[{"change":5,"pos":2079}],"flag":"BLOCK","start":1351,"end":1425,"inode":{"change":5,"pos":1297}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2017},"to":{"change":5,"start":1227,"end":1301},"introduced_by":5}],"inode":{"change":5,"pos":1297}},"ins_contents":[{"Add":"S3BinaryCacheStore::S3BinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":"S3BinaryCacheStore::S3BinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1297},"path":"src/hydra-queue-runner/s3-binary-cache-store.cc","line":37,"ins":{"up_context":[{"change":5,"pos":2175}],"down_context":[{"change":5,"pos":2240}],"flag":"BLOCK","start":1426,"end":1491,"inode":{"change":5,"pos":1297}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2175},"to":{"change":5,"start":1302,"end":1369},"introduced_by":5}],"inode":{"change":5,"pos":1297}},"ins_contents":[{"Add":" : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)"}],"del_contents":[{"Del":" : BinaryCacheStore(storeFactory, secretKeyFile, publicKeyFile)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":5519},"path":"src/hydra-queue-runner/s3-binary-cache-store.hh","line":23,"ins":{"up_context":[{"change":5,"pos":5890}],"down_context":[{"change":5,"pos":5936}],"flag":"BLOCK","start":1492,"end":1550,"inode":{"change":5,"pos":5519}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5890},"to":{"change":5,"start":1370,"end":1428},"introduced_by":5}],"inode":{"change":5,"pos":5519}},"ins_contents":[{"Add":" S3BinaryCacheStore(std::shared_ptr localStore,"}],"del_contents":[{"Del":" S3BinaryCacheStore(const StoreFactory & storeFactory,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":83,"ins":{"up_context":[{"change":5,"pos":4019}],"down_context":[{"change":5,"pos":4061}],"flag":"BLOCK","start":1551,"end":1598,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4019},"to":{"change":5,"start":4019,"end":4061},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync> steps;"}],"del_contents":[{"Del":" Sync> steps;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":190,"ins":{"up_context":[{"change":5,"pos":3142}],"down_context":[{"change":5,"pos":3165}],"flag":"BLOCK","start":1599,"end":1627,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":3142},"to":{"change":5,"start":3142,"end":3165},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync state;"}],"del_contents":[{"Del":" Sync state;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":230,"ins":{"up_context":[{"change":5,"pos":1953}],"down_context":[{"change":5,"pos":1992}],"flag":"BLOCK","start":1628,"end":1672,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1953},"to":{"change":5,"start":1953,"end":1992},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync connectInfo;"}],"del_contents":[{"Del":" Sync connectInfo;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":269,"ins":{"up_context":[{"change":5,"pos":4496}],"down_context":[{"change":5,"pos":4566}],"flag":"BLOCK","start":1673,"end":1703,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4496},"to":{"change":5,"start":4496,"end":4521},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync builds;"}],"del_contents":[{"Del":" Sync builds;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":273,"ins":{"up_context":[{"change":5,"pos":4670}],"down_context":[{"change":5,"pos":4521}],"flag":"BLOCK","start":1704,"end":1736,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4670},"to":{"change":5,"start":4670,"end":4697},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync jobsets;"}],"del_contents":[{"Del":" Sync jobsets;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":280,"ins":{"up_context":[{"change":5,"pos":525}],"down_context":[{"change":5,"pos":4810}],"flag":"BLOCK","start":1737,"end":1765,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":525},"to":{"change":5,"start":4787,"end":4810},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4787},"to":{"change":5,"start":4787,"end":4810},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync steps;"}],"del_contents":[{"Del":" Sync steps;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":284,"ins":{"up_context":[{"change":5,"pos":4912}],"down_context":[{"change":5,"pos":4941}],"flag":"BLOCK","start":1766,"end":1800,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4912},"to":{"change":5,"start":4912,"end":4941},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync runnable;"}],"del_contents":[{"Del":" Sync runnable;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":287,"ins":{"up_context":[{"change":5,"pos":4985}],"down_context":[{"change":5,"pos":5063}],"flag":"BLOCK","start":1801,"end":1887,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4985},"to":{"change":2,"start":578,"end":663},"introduced_by":2}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync dispatcherWakeup;"},{"Add":" std::condition_variable dispatcherWakeupCV;"}],"del_contents":[{"Del":" Sync dispatcherWakeup;\n std::condition_variable_any dispatcherWakeupCV;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":291,"ins":{"up_context":[{"change":5,"pos":5102}],"down_context":[{"change":5,"pos":5131}],"flag":"BLOCK","start":1888,"end":1922,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5102},"to":{"change":5,"start":5102,"end":5131},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Pool dbPool;"}],"del_contents":[{"Del":" Pool dbPool;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":295,"ins":{"up_context":[{"change":5,"pos":584}],"down_context":[{"change":5,"pos":5334}],"flag":"BLOCK","start":1923,"end":1989,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":584},"to":{"change":5,"start":5215,"end":5276},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5215},"to":{"change":5,"start":5215,"end":5276},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync machines; // FIXME: use atomic_shared_ptr"}],"del_contents":[{"Del":" Sync machines; // FIXME: use atomic_shared_ptr\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":317,"ins":{"up_context":[{"change":5,"pos":6122}],"down_context":[{"change":5,"pos":6222}],"flag":"BLOCK","start":1990,"end":2096,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6122},"to":{"change":5,"start":614,"end":666},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":666},"to":{"change":5,"start":6169,"end":6222},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6169},"to":{"change":5,"start":6169,"end":6222},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync> logCompressorQueue;"},{"Add":" std::condition_variable logCompressorWakeup;"}],"del_contents":[{"Del":" Sync> logCompressorQueue;\n"},{"Del":" std::condition_variable_any logCompressorWakeup;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":325,"ins":{"up_context":[{"change":5,"pos":6569}],"down_context":[{"change":5,"pos":6691}],"flag":"BLOCK","start":2097,"end":2220,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6569},"to":{"change":5,"start":6569,"end":6691},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync> notificationSenderQueue;"},{"Add":" std::condition_variable notificationSenderWakeup;"}],"del_contents":[{"Del":" Sync> notificationSenderQueue;\n std::condition_variable_any notificationSenderWakeup;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":339,"ins":{"up_context":[{"change":5,"pos":2678}],"down_context":[{"change":5,"pos":2737}],"flag":"BLOCK","start":2221,"end":2285,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2678},"to":{"change":5,"start":2678,"end":2737},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::Sync> machineTypes;"}],"del_contents":[{"Del":" Sync> machineTypes;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":353,"ins":{"up_context":[{"change":5,"pos":6778}],"down_context":[{"change":5,"pos":1458}],"flag":"BLOCK","start":2286,"end":2331,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6778},"to":{"change":5,"start":1262,"end":1330},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1330},"to":{"change":5,"start":1429,"end":1458},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6778},"to":{"change":5,"start":1429,"end":1458},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" std::shared_ptr _localStore;"}],"del_contents":[{"Del":" /* Pool of local stores. */\n nix::StorePool localStorePool;\n\n"},{"Del":" /* Destination store. */\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":363,"ins":{"up_context":[{"change":5,"pos":13272}],"down_context":[{"change":5,"pos":13314}],"flag":"BLOCK","start":2332,"end":2374,"inode":{"change":5,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13272},"to":{"change":5,"start":1331,"end":1375},"introduced_by":5}],"inode":{"change":5,"pos":1128}},"ins_contents":[{"Add":" nix::ref getLocalStore();"}],"del_contents":[{"Del":" nix::StorePool::Handle getLocalStore();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":1640},"path":"src/hydra-queue-runner/token-server.hh","line":17,"ins":{"up_context":[{"change":5,"pos":2032}],"down_context":[{"change":5,"pos":2072}],"flag":"BLOCK","start":2375,"end":2411,"inode":{"change":5,"pos":1640}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2032},"to":{"change":5,"start":2032,"end":2072},"introduced_by":5}],"inode":{"change":5,"pos":1640}},"ins_contents":[{"Add":" std::condition_variable wakeup;"}],"del_contents":[{"Del":" std::condition_variable_any wakeup;\n"}]}}],"owner":"grahamc","repo":"hydra2","token":"nxH9a4EdCu/aN309pxnux3Bj5E8FKrtlcKBfZQD9Au8=","login":null}

…

Dependencies

Change contents