grahamc/hydra2 - Change YNGIYQRFBKRKSRPSYSIG3R3U73ANOO5MC6C7VO4XOTDNBQHCKL3AC

hydra-eval-jobs: Don't keep track of used inputs

We no longer store this in the database, so it's not necessary for hydra-eval-jobs to do this.

Created by Eelco Dolstra on September 25, 2014

YNGIYQRFBKRKSRPSYSIG3R3U73ANOO5MC6C7VO4XOTDNBQHCKL3AC

Dependencies

In channels

main

Change contents

Deletion in src/c/hydra-eval-jobs.cc at line 22 [9.303]
B:BD[7.28] → [8.350:420]
```
typedef std::map<Symbol, std::pair<unsigned int, Value *> > ArgsUsed;
```

Replacement in src/c/hydra-eval-jobs.cc at line 27 [9.303]

B:BD[10.218] → [11.118:217]

    const ArgsUsed & argsUsed, const AutoArgs & argsLeft,
    Value & v, const string & attrPath);

[10.218]

[12.96]

    const AutoArgs & argsLeft, Value & v, const string & attrPath);

Replacement in src/c/hydra-eval-jobs.cc at line 31 [9.303]

B:BD[12.157] → [11.218:318]

    const ArgsUsed & argsUsed, const AutoArgs & argsLeft,
    const string & attrPath, Value & fun,

[12.157]

[11.318]

    const AutoArgs & argsLeft, const string & attrPath, Value & fun,

Replacement in src/c/hydra-eval-jobs.cc at line 41 [9.303]

∅:D[8.676] → [11.561:624]

B:BD[11.561] → [11.561:624]

        findJobs(state, doc, argsUsed, argsLeft, v, attrPath);

[8.676]

[12.448]

        findJobs(state, doc, argsLeft, v, attrPath);

Replacement in src/c/hydra-eval-jobs.cc at line 53 [9.303]

B:BD[3.177] → [3.177:268]

        tryJobAlts(state, doc, argsUsed, argsLeft, attrPath, fun, next, last, actualArgs);

[3.177]

[3.268]

        tryJobAlts(state, doc, argsLeft, attrPath, fun, next, last, actualArgs);

Deletion in src/c/hydra-eval-jobs.cc at line 62 [9.303]
∅:D[5.258] → [11.941:979]
B:BD[11.941] → [11.941:979]
```
        ArgsUsed argsUsed2(argsUsed);
```

Deletion in src/c/hydra-eval-jobs.cc at line 65 [9.303]

B:BD[8.833] → [8.833:905]

        argsUsed2[cur->name] = std::pair<unsigned int, Value *>(n, *i);

Replacement in src/c/hydra-eval-jobs.cc at line 66 [9.303]

B:BD[11.1166] → [11.1166:1260]

        tryJobAlts(state, doc, argsUsed2, argsLeft2, attrPath, fun, next, last, actualArgs2);

[11.1166]

[11.1260]

        tryJobAlts(state, doc, argsLeft2, attrPath, fun, next, last, actualArgs2);

Deletion in src/c/hydra-eval-jobs.cc at line 68 [9.303]
B:BD[11.1273] → [11.1273:1279]
∅:D[13.123] → [14.0:4]
∅:D[11.1279] → [14.0:4]
B:BD[12.1405] → [14.0:4]
B:BD[14.4] → [11.1280:1349]
∅:D[11.1349] → [14.73:75]
B:BD[14.73] → [14.73:75]
B:BD[14.75] → [11.1350:1404]
∅:D[11.1404] → [14.129:157]
B:BD[14.129] → [14.129:157]
B:BD[14.157] → [11.1405:1443]
B:BD[11.1443] → [8.906:978]
∅:D[8.978] → [11.1514:1572]
B:BD[11.1514] → [11.1514:1572]
∅:D[15.343] → [14.257:306]
∅:D[11.1572] → [14.257:306]
B:BD[14.257] → [14.257:306]
```
    }
}
static void showArgsUsed(XMLWriter & doc, const ArgsUsed & argsUsed)
{
    foreach (ArgsUsed::const_iterator, i, argsUsed) {
        XMLAttrs xmlAttrs2;
        xmlAttrs2["name"] = i->first;
        xmlAttrs2["value"] = (format("%1%") % *i->second.second).str();
        xmlAttrs2["altnr"] = int2String(i->second.first);
        doc.writeEmptyElement("arg", xmlAttrs2);
```

Replacement in src/c/hydra-eval-jobs.cc at line 97 [9.303]

B:BD[14.377] → [11.1575:1673]

    const ArgsUsed & argsUsed, const AutoArgs & argsLeft,
    Value & v, const string & attrPath)

[14.377]

[10.255]

    const AutoArgs & argsLeft, Value & v, const string & attrPath)

Deletion in src/c/hydra-eval-jobs.cc at line 167 [9.303]
B:BD[2.321] → [2.321:322]
∅:D[2.322] → [14.378:419]
B:BD[10.1148] → [14.378:419]
```
            showArgsUsed(doc, argsUsed);
```

Replacement in src/c/hydra-eval-jobs.cc at line 172 [9.303]

B:BD[16.178] → [16.178:250]

                    findJobs(state, doc, argsUsed, argsLeft, *i->value,

[16.178]

[16.250]

                    findJobs(state, doc, argsLeft, *i->value,

Replacement in src/c/hydra-eval-jobs.cc at line 180 [9.303]
∅:D[4.49] → [11.2048:2112]
B:BD[11.2048] → [11.2048:2112]
```
        tryJobAlts(state, doc, argsUsed, argsLeft, attrPath, v,
```
[4.49]
[11.2112]
```
        tryJobAlts(state, doc, argsLeft, attrPath, v,
```

Replacement in src/c/hydra-eval-jobs.cc at line 196 [9.303]

B:BD[14.551] → [11.2304:2402]

    const ArgsUsed & argsUsed, const AutoArgs & argsLeft,
    Value & v, const string & attrPath)

[14.551]

[14.646]

    const AutoArgs & argsLeft, Value & v, const string & attrPath)

Replacement in src/c/hydra-eval-jobs.cc at line 199 [9.303]

B:BD[14.658] → [11.2403:2473]

        findJobsWrapped(state, doc, argsUsed, argsLeft, v, attrPath);

[14.658]

[17.0]

        findJobsWrapped(state, doc, argsLeft, v, attrPath);

Deletion in src/c/hydra-eval-jobs.cc at line 205 [9.303]
B:BD[14.907] → [14.907:944]
```
        showArgsUsed(doc, argsUsed);
```

Replacement in src/c/hydra-eval-jobs.cc at line 271 [9.303]

B:BD[18.2067] → [18.2067:2126]

        findJobs(state, doc, ArgsUsed(), autoArgs, v, "");

[18.2067]

[9.1022]

        findJobs(state, doc, autoArgs, v, "");

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 366 [19.2663]

B:BD[6.431] → [6.431:432]

∅:D[6.432] → [20.67:360]

B:BD[20.67] → [20.67:360]


        my $validJob = 1;
        foreach my $arg (@{$job->{arg}}) {
            my $input = $inputInfo->{$arg->{name}}->[$arg->{altnr}];
            $validJob = 0 if $input->{type} eq "sysbuild" && $input->{system} ne $job->{system};
        }
        push(@filteredJobs, $job) if $validJob;

[6.431]

[20.360]

        push @filteredJobs, $job;