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

Merge branch 'ca-drv' of github.com:Ericson2314/nix into misc-ca

Browse source
This commit is contained in:
John Ericson 2020-07-28 21:12:36 +00:00
parent 7cf978440c 2980b244b7
commit df707d05d1
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.4 3.0

6
src/libstore/derivations.cc
View file

@ -33,7 +33,7 @@ bool derivationIsCA(DerivationType dt) {
}; };
// Since enums can have non-variant values, but making a `default:` would // Since enums can have non-variant values, but making a `default:` would
// disable exhaustiveness warnings. // disable exhaustiveness warnings.
abort(); assert(false);
} }
bool derivationIsFixed(DerivationType dt) { bool derivationIsFixed(DerivationType dt) {
@ -42,7 +42,7 @@ bool derivationIsFixed(DerivationType dt) {
case DerivationType::CAFixed: return true; case DerivationType::CAFixed: return true;
case DerivationType::CAFloating: return false; case DerivationType::CAFloating: return false;
}; };
abort(); assert(false);
} }
bool derivationIsImpure(DerivationType dt) { bool derivationIsImpure(DerivationType dt) {
@ -51,7 +51,7 @@ bool derivationIsImpure(DerivationType dt) {
case DerivationType::CAFixed: return true; case DerivationType::CAFixed: return true;
case DerivationType::CAFloating: return false; case DerivationType::CAFloating: return false;
}; };
abort(); assert(false);
} }

7
src/libstore/s3-binary-cache-store.cc
View file

@ -343,13 +343,10 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1) std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1)
.count(); .count();
auto size = istream->tellg(); printInfo("uploaded 's3://%s/%s' in %d ms",
bucketName, path, duration);
printInfo("uploaded 's3://%s/%s' (%d bytes) in %d ms",
bucketName, path, size, duration);
stats.putTimeMs += duration; stats.putTimeMs += duration;
stats.putBytes += size;
stats.put++; stats.put++;
} }

1
src/libstore/s3-binary-cache-store.hh
View file

@ -19,7 +19,6 @@ public:
struct Stats struct Stats
{ {
std::atomic<uint64_t> put{0}; std::atomic<uint64_t> put{0};
std::atomic<uint64_t> putBytes{0};
std::atomic<uint64_t> putTimeMs{0}; std::atomic<uint64_t> putTimeMs{0};
std::atomic<uint64_t> get{0}; std::atomic<uint64_t> get{0};
std::atomic<uint64_t> getBytes{0}; std::atomic<uint64_t> getBytes{0};