grahamc/hydra2 - Change 4D7CHQ345ZSI52GPNW73JOYALRLFEGI2YUDWKG4UCDE55MO5LQ2AC

createStep(): Cache finished derivations

This gets rid of a lot of redundant calls to readDerivation().

Created by Eelco Dolstra on June 22, 2015

4D7CHQ345ZSI52GPNW73JOYALRLFEGI2YUDWKG4UCDE55MO5LQ2AC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 307 [4.4840]

B:BD[3.1249] → [2.263:323]

        Build::ptr referringBuild, Step::ptr referringStep,

[3.1249]

[5.0]

        Build::ptr referringBuild, Step::ptr referringStep, std::set<Path> & finishedDrvs,

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 568 [4.4840]

B:BD[6.354] → [2.367:460]

        Step::ptr step = createStep(store, build->drvPath, build, 0, newSteps, newRunnable);

[6.354]

[6.355]

        std::set<Path> finishedDrvs; // FIXME: re-use?
        Step::ptr step = createStep(store, build->drvPath, build, 0, finishedDrvs, newSteps, newRunnable);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 718 [4.4840]

B:BD[3.4065] → [2.550:606]

    Build::ptr referringBuild, Step::ptr referringStep,

[3.4065]

[5.443]

    Build::ptr referringBuild, Step::ptr referringStep, std::set<Path> & finishedDrvs,

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 721 [4.4840]
[4.11566]
[2.607]
```
    if (finishedDrvs.find(drvPath) != finishedDrvs.end()) return 0;
```
Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 789 [4.4840]
B:BD[4.12108] → [4.12108:12133]
```
    if (valid) return 0;
```
[4.12108]
[4.12133]
```
    if (valid) {
        finishedDrvs.insert(drvPath);
        return 0;
    }
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 800 [4.4840]

B:BD[4.12329] → [2.1993:2072]

        auto dep = createStep(store, i.first, 0, step, newSteps, newRunnable);

[4.12329]

[4.12374]

        auto dep = createStep(store, i.first, 0, step, finishedDrvs, newSteps, newRunnable);