grahamc/hydra2 - Change PDJCVDVY6R4ZCBELQR3KXPJ3LE7TVXG6N74USR7HWBOIE2P6HDAAC

Fix segfault sorting runnable steps

Same problem as d744362e4a249a92ecfc3e48eae135e3a46db49e.

at &#x2f;nix&#x2f;store&#x2f;ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3&#x2f;include&#x2f;c++&#x2f;4.9.3&#x2f;bits&#x2f;predefined_ops.h:166
__last@entry=..., __comp=...) at &#x2f;nix&#x2f;store&#x2f;ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3&#x2f;include&#x2f;c++&#x2f;4.9.3&#x2f;bits&#x2f;stl_algo.h:1827
__comp=...) at &#x2f;nix&#x2f;store&#x2f;ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3&#x2f;include&#x2f;c++&#x2f;4.9.3&#x2f;bits&#x2f;stl_algo.h:4717

Created by Eelco Dolstra on March 2, 2016

PDJCVDVY6R4ZCBELQR3KXPJ3LE7TVXG6N74USR7HWBOIE2P6HDAAC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/dispatcher.cc at line 147 [5.14628]

∅:D[2.1080] → [4.245:292]

B:BD[4.245] → [4.245:292]

        std::vector<Step::ptr> runnableSorted;

[2.1080]

[3.66]

        struct StepInfo
        {
            Step::ptr step;
            /* The lowest share used of any jobset depending on this
               step. */
            double lowestShareUsed = 1e9;
            /* Info copied from step->state to ensure that the
               comparator is a partial ordering (see MachineInfo). */
            int highestGlobalPriority;
            int highestLocalPriority;
            BuildID lowestBuildID;
            StepInfo(Step::ptr step, Step::State & step_) : step(step)
            {
                for (auto & jobset : step_.jobsets)
                    lowestShareUsed = std::min(lowestShareUsed, jobset->shareUsed());
                highestGlobalPriority = step_.highestGlobalPriority;
                highestLocalPriority = step_.highestLocalPriority;
                lowestBuildID = step_.lowestBuildID;
            }
        };
        std::vector<StepInfo> runnableSorted;

Insertion in src/hydra-queue-runner/dispatcher.cc at line 178 [5.14628]
[3.199]
[3.199]
Insertion in src/hydra-queue-runner/dispatcher.cc at line 180 [5.14628]
[3.273]
[4.292]

Replacement in src/hydra-queue-runner/dispatcher.cc at line 200 [5.14628]

B:BD[6.3859] → [6.3859:3929]

B:BD[6.3929] → [3.364:476]

∅:D[3.476] → [6.3929:4105]

B:BD[6.3929] → [6.3929:4105]

B:BD[5.18166] → [5.18166:18222]

                {
                    auto step_(step->state.lock());
                    r.waitTime += std::chrono::duration_cast<std::chrono::seconds>(now - step_->runnableSince);
                    if (step_->tries > 0 && step_->after > now) {
                        if (step_->after < sleepUntil)
                            sleepUntil = step_->after;
                        continue;
                    }

[6.3859]

[4.423]

                auto step_(step->state.lock());
                r.waitTime += std::chrono::duration_cast<std::chrono::seconds>(now - step_->runnableSince);
                if (step_->tries > 0 && step_->after > now) {
                    if (step_->after < sleepUntil)
                        sleepUntil = step_->after;
                    continue;

Replacement in src/hydra-queue-runner/dispatcher.cc at line 208 [5.14628]

B:BD[4.442] → [4.442:490]

                runnableSorted.push_back(step);

[4.442]

[4.490]

                runnableSorted.emplace_back(step, *step_);

Deletion in src/hydra-queue-runner/dispatcher.cc at line 212 [5.14628]

B:BD[4.515] → [7.906:1193]

        for (auto & step : runnableSorted) {
            auto step_(step->state.lock());
            step_->lowestShareUsed = 1e9;
            for (auto & jobset : step_->jobsets)
                step_->lowestShareUsed = std::min(step_->lowestShareUsed, jobset->shareUsed());
        }

Replacement in src/hydra-queue-runner/dispatcher.cc at line 213 [5.14628]

B:BD[4.574] → [4.574:631]

            [](const Step::ptr & a, const Step::ptr & b)

[4.574]

[4.631]

            [](const StepInfo & a, const StepInfo & b)

Deletion in src/hydra-queue-runner/dispatcher.cc at line 215 [5.14628]

B:BD[4.645] → [4.645:749]

                auto a_(a->state.lock());
                auto b_(b->state.lock()); // FIXME: deadlock?

Replacement in src/hydra-queue-runner/dispatcher.cc at line 216 [5.14628]

B:BD[8.23] → [8.23:156]

B:BD[8.156] → [7.1194:1303]

B:BD[7.1303] → [2.1081:1210]

∅:D[2.1210] → [8.156:215]

∅:D[7.1303] → [8.156:215]

B:BD[8.156] → [8.156:215]

                    a_->highestGlobalPriority != b_->highestGlobalPriority ? a_->highestGlobalPriority > b_->highestGlobalPriority :
                    a_->lowestShareUsed != b_->lowestShareUsed ? a_->lowestShareUsed < b_->lowestShareUsed :
                    a_->highestLocalPriority != b_->highestLocalPriority ? a_->highestLocalPriority > b_->highestLocalPriority :
                    a_->lowestBuildID < b_->lowestBuildID;

[8.23]

[4.811]

                    a.highestGlobalPriority != b.highestGlobalPriority ? a.highestGlobalPriority > b.highestGlobalPriority :
                    a.lowestShareUsed != b.lowestShareUsed ? a.lowestShareUsed < b.lowestShareUsed :
                    a.highestLocalPriority != b.highestLocalPriority ? a.highestLocalPriority > b.highestLocalPriority :
                    a.lowestBuildID < b.lowestBuildID;

Replacement in src/hydra-queue-runner/dispatcher.cc at line 230 [5.14628]

B:BD[4.1178] → [4.1178:1227]

            for (auto & step : runnableSorted) {

[4.1178]

[4.1227]

            for (auto & stepInfo : runnableSorted) {
                auto & step(stepInfo.step);

Deletion in src/hydra-queue-runner/state.hh at line 173 [9.1128]

B:BD[8.2151] → [7.4447:4565]


        /* The lowest share used of any jobset depending on this
           step. */
        double lowestShareUsed;