diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-04 08:40:38 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-04 08:40:38 +0100 |
| commit | 2bb0a063466e7ef940b91d6eb441d4a0c5f0fb1f (patch) | |
| tree | 6cc9486faf829e8da3cac95c11980388f942a926 /src/libstore/machines.cc | |
| parent | 044c117a9f8ae92241076b2afa1a419cdc912c5e (diff) | |
Merge pull request #9841 from obsidiansystems/float-speed-factor
Convert `Machine::speedFactor` from a non-neg int to a non-neg float
(cherry picked from commit 69d0ae27e376e7c7c4f237716b0149223b8a805a)
Change-Id: I2afb5cf9e4fe1384985c58353946135c3d102b42
Diffstat (limited to 'src/libstore/machines.cc')
| -rw-r--r-- | src/libstore/machines.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index 0aa497357..f808b8592 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -33,11 +33,14 @@ Machine::Machine(decltype(storeUri) storeUri, systemTypes(systemTypes), sshKey(sshKey), maxJobs(maxJobs), - speedFactor(std::max(1U, speedFactor)), + speedFactor(speedFactor == 0.0f ? 1.0f : std::move(speedFactor)), supportedFeatures(supportedFeatures), mandatoryFeatures(mandatoryFeatures), sshPublicHostKey(sshPublicHostKey) -{} +{ + if (speedFactor < 0.0) + throw UsageError("speed factor must be >= 0"); +} bool Machine::systemSupported(const std::string & system) const { @@ -136,6 +139,14 @@ static Machine parseBuilderLine(const std::string & line) return result.value(); }; + auto parseFloatField = [&](size_t fieldIndex) { + const auto result = string2Int<float>(tokens[fieldIndex]); + if (!result) { + throw FormatError("bad machine specification: failed to convert column #%lu in a row: '%s' to 'float'", fieldIndex, line); + } + return result.value(); + }; + auto ensureBase64 = [&](size_t fieldIndex) { const auto & str = tokens[fieldIndex]; try { @@ -154,7 +165,7 @@ static Machine parseBuilderLine(const std::string & line) isSet(1) ? tokenizeString<std::set<std::string>>(tokens[1], ",") : std::set<std::string>{settings.thisSystem}, isSet(2) ? tokens[2] : "", isSet(3) ? parseUnsignedIntField(3) : 1U, - isSet(4) ? parseUnsignedIntField(4) : 1U, + isSet(4) ? parseFloatField(4) : 1.0f, isSet(5) ? tokenizeString<std::set<std::string>>(tokens[5], ",") : std::set<std::string>{}, isSet(6) ? tokenizeString<std::set<std::string>>(tokens[6], ",") : std::set<std::string>{}, isSet(7) ? ensureBase64(7) : "" |