Slight cleanup

[?]
Jul 21, 2017, 3:22 PM
4ZJIJCVFRNMKUEZDVHBLLVLWUM2OHFSVGC3A5HWDR3ZLS2TR77NAC

Dependencies

  • [2] HJOEIMLR Refactor
  • [3] CNLNT3T4 Allow only 1 thread to send a closure to a given machine at the same time
  • [4] NSBNNM77 Add hydra.conf option "nar_buffer_size" to configure memoryTokens limit

Change contents

  • replacement in src/hydra-queue-runner/state.hh at line 241
    [2.3852][2.3852:3937]()
    if (systemTypes.find(step->drv.platform) == systemTypes.end()) return false;
    [2.3852]
    [2.3937]
    /* Check that this machine is of the type required by the
    step. */
    if (!systemTypes.count(step->drv.platform)) return false;
    /* Check that the step requires all mandatory features of this
    machine. (Thus, a machine with the mandatory "benchmark"
    feature will *only* execute steps that require
    "benchmark".) The "preferLocalBuild" bit of a step is
    mapped to the "local" feature; thus machines that have
    "local" as a mandatory feature will only do
    preferLocalBuild steps. */
  • replacement in src/hydra-queue-runner/state.hh at line 253
    [2.3980][2.3980:4133]()
    if (step->requiredSystemFeatures.find(f) == step->requiredSystemFeatures.end()
    && !(step->preferLocalBuild && f == "local"))
    [2.3980]
    [2.4133]
    if (!step->requiredSystemFeatures.count(f)
    && !(f == "local" && step->preferLocalBuild))
  • edit in src/hydra-queue-runner/state.hh at line 256
    [2.4163]
    [2.4163]
    /* Check that the machine supports all features required by
    the step. */
  • replacement in src/hydra-queue-runner/state.hh at line 260
    [2.4217][2.4217:4301]()
    if (supportedFeatures.find(f) == supportedFeatures.end()) return false;
    [2.4217]
    [2.4301]
    if (!supportedFeatures.count(f)) return false;