{"header":{"message":"Fix segfault sorting runnable steps","description":"Same problem as d744362e4a249a92ecfc3e48eae135e3a46db49e.\n\n at /nix/store/ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3/include/c++/4.9.3/bits/predefined_ops.h:166\n __last@entry=..., __comp=...) at /nix/store/ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3/include/c++/4.9.3/bits/stl_algo.h:1827\n __comp=...) at /nix/store/ksvsbr7pg4z69bv6fbbc8h7x7rm2104m-gcc-4.9.3/include/c++/4.9.3/bits/stl_algo.h:4717","timestamp":"2016-03-02T12:59:24Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"PDJCVDVY6R4ZCBELQR3KXPJ3LE7TVXG6N74USR7HWBOIE2P6HDAAC","authors":[],"deps":{"hashes":[["PDJCVDVY6R4ZCBELQR3KXPJ3LE7TVXG6N74USR7HWBOIE2P6HDAAC","Fix segfault sorting runnable steps"],["AA",null],["UPNGFCXGAFSLL2XTBFDIUX2FBPHUCBNRCDRGRSPXCDNTMF3DP44QC","For completeness, re-implement meta.schedulingPriority"],["TTBLPQAJKPRC6W23QIFTPI2MM4VYR3D3CR6F7U53WU5GJDAYJW4AC","Keep track of wait time per system type"],["4I2HF4L3JOC6KPYLI2YTEVTHBRRYO5XKXOZ6VQ2SJKSQKAPNQXCQC","Unindent"],["IK2UBDAU6QKUXHJG3SXJKYGIIXRDKI6UVRTFC6ZVDXDCGNCMEWVAC","Revive jobset scheduling"],["5N7LVAJNE4LN6H7HLPOHTROMDHT3DYJIO6GE4CVSAWZZIDNN66NAC","Keep track of requiredSystemFeatures in the machine stats"],["MHVIT4JYWUYD4UCGB2AHLXWLX6B5SYE22BREERNGANT7RGGDUFOAC","Split hydra-queue-runner.cc more"],["WE5Q2NVIIK4R2DUUZYLJFQVYK5O26EDEJRPK3CPGWHU3SEAC2DQAC","Allow build to be bumped to the front of the queue via the web interface"],["EYR3EW6JVHNVLXMI57FUVPHQAHPETBML4H44OGJFHUT54KTTHIGQC","Keep stats for the Hydra auto scaler"],["46ADBTMQAHQAPW3OCI24F4I5DVK5N5QVHUA4TQVB6HFN337CHAVQC","Start steps in order of ascending build ID"],["HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC","Refactor"]],"deps":["UPNGFCXGAFSLL2XTBFDIUX2FBPHUCBNRCDRGRSPXCDNTMF3DP44QC","TTBLPQAJKPRC6W23QIFTPI2MM4VYR3D3CR6F7U53WU5GJDAYJW4AC"],"known":["MHVIT4JYWUYD4UCGB2AHLXWLX6B5SYE22BREERNGANT7RGGDUFOAC","4I2HF4L3JOC6KPYLI2YTEVTHBRRYO5XKXOZ6VQ2SJKSQKAPNQXCQC","46ADBTMQAHQAPW3OCI24F4I5DVK5N5QVHUA4TQVB6HFN337CHAVQC","WE5Q2NVIIK4R2DUUZYLJFQVYK5O26EDEJRPK3CPGWHU3SEAC2DQAC","IK2UBDAU6QKUXHJG3SXJKYGIIXRDKI6UVRTFC6ZVDXDCGNCMEWVAC","EYR3EW6JVHNVLXMI57FUVPHQAHPETBML4H44OGJFHUT54KTTHIGQC","5N7LVAJNE4LN6H7HLPOHTROMDHT3DYJIO6GE4CVSAWZZIDNN66NAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":147,"ins":{"up_context":[{"change":2,"pos":1080}],"down_context":[{"change":3,"pos":66}],"flag":"BLOCK","start":0,"end":930,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":1080},"to":{"change":4,"start":245,"end":292},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":245},"to":{"change":4,"start":245,"end":292},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" struct StepInfo"},{"Add":" {"},{"Add":" Step::ptr step;"},{"Add":""},{"Add":" /* The lowest share used of any jobset depending on this"},{"Add":" step. */"},{"Add":" double lowestShareUsed = 1e9;"},{"Add":""},{"Add":" /* Info copied from step->state to ensure that the"},{"Add":" comparator is a partial ordering (see MachineInfo). */"},{"Add":" int highestGlobalPriority;"},{"Add":" int highestLocalPriority;"},{"Add":" BuildID lowestBuildID;"},{"Add":""},{"Add":" StepInfo(Step::ptr step, Step::State & step_) : step(step)"},{"Add":" {"},{"Add":" for (auto & jobset : step_.jobsets)"},{"Add":" lowestShareUsed = std::min(lowestShareUsed, jobset->shareUsed());"},{"Add":" highestGlobalPriority = step_.highestGlobalPriority;"},{"Add":" highestLocalPriority = step_.highestLocalPriority;"},{"Add":" lowestBuildID = step_.lowestBuildID;"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" std::vector runnableSorted;"},{"Add":""}],"del_contents":[{"Del":" std::vector runnableSorted;\n"}]}},{"Edit":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":178,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":199}],"down_context":[{"change":3,"pos":199}],"flag":"BLOCK","start":931,"end":932,"inode":{"change":4,"pos":14628}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":180,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":273}],"down_context":[{"change":4,"pos":292}],"flag":"BLOCK","start":933,"end":934,"inode":{"change":4,"pos":14628}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":200,"ins":{"up_context":[{"change":4,"pos":3859}],"down_context":[{"change":4,"pos":423}],"flag":"BLOCK","start":935,"end":1285,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3859},"to":{"change":4,"start":3859,"end":3929},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3929},"to":{"change":3,"start":364,"end":476},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":476},"to":{"change":4,"start":3929,"end":4105},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3929},"to":{"change":4,"start":3929,"end":4105},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":18166},"to":{"change":4,"start":18166,"end":18222},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" auto step_(step->state.lock());"},{"Add":" r.waitTime += std::chrono::duration_cast(now - step_->runnableSince);"},{"Add":" if (step_->tries > 0 && step_->after > now) {"},{"Add":" if (step_->after < sleepUntil)"},{"Add":" sleepUntil = step_->after;"},{"Add":" continue;"}],"del_contents":[{"Del":" {\n auto step_(step->state.lock());\n"},{"Del":" r.waitTime += std::chrono::duration_cast(now - step_->runnableSince);\n"},{"Del":" if (step_->tries > 0 && step_->after > now) {\n if (step_->after < sleepUntil)\n sleepUntil = step_->after;\n"},{"Del":" continue;\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":208,"ins":{"up_context":[{"change":4,"pos":442}],"down_context":[{"change":4,"pos":490}],"flag":"BLOCK","start":1286,"end":1345,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":442},"to":{"change":4,"start":442,"end":490},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" runnableSorted.emplace_back(step, *step_);"}],"del_contents":[{"Del":" runnableSorted.push_back(step);\n"}]}},{"Edit":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":212,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":515},"to":{"change":4,"start":906,"end":1193},"introduced_by":4}],"inode":{"change":4,"pos":14628}}},"contents":[{"Del":" for (auto & step : runnableSorted) {\n auto step_(step->state.lock());\n step_->lowestShareUsed = 1e9;\n for (auto & jobset : step_->jobsets)\n step_->lowestShareUsed = std::min(step_->lowestShareUsed, jobset->shareUsed());\n }\n\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":213,"ins":{"up_context":[{"change":4,"pos":574}],"down_context":[{"change":4,"pos":631}],"flag":"BLOCK","start":1346,"end":1401,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":574},"to":{"change":4,"start":574,"end":631},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" [](const StepInfo & a, const StepInfo & b)"}],"del_contents":[{"Del":" [](const Step::ptr & a, const Step::ptr & b)\n"}]}},{"Edit":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":215,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":645},"to":{"change":4,"start":645,"end":749},"introduced_by":4}],"inode":{"change":4,"pos":14628}}},"contents":[{"Del":" auto a_(a->state.lock());\n auto b_(b->state.lock()); // FIXME: deadlock?\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":216,"ins":{"up_context":[{"change":4,"pos":23}],"down_context":[{"change":4,"pos":811}],"flag":"BLOCK","start":1402,"end":1804,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":23},"to":{"change":4,"start":23,"end":156},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":156},"to":{"change":4,"start":1194,"end":1303},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1303},"to":{"change":2,"start":1081,"end":1210},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1210},"to":{"change":4,"start":156,"end":215},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1303},"to":{"change":4,"start":156,"end":215},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":156},"to":{"change":4,"start":156,"end":215},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" a.highestGlobalPriority != b.highestGlobalPriority ? a.highestGlobalPriority > b.highestGlobalPriority :"},{"Add":" a.lowestShareUsed != b.lowestShareUsed ? a.lowestShareUsed < b.lowestShareUsed :"},{"Add":" a.highestLocalPriority != b.highestLocalPriority ? a.highestLocalPriority > b.highestLocalPriority :"},{"Add":" a.lowestBuildID < b.lowestBuildID;"}],"del_contents":[{"Del":" a_->highestGlobalPriority != b_->highestGlobalPriority ? a_->highestGlobalPriority > b_->highestGlobalPriority :\n"},{"Del":" a_->lowestShareUsed != b_->lowestShareUsed ? a_->lowestShareUsed < b_->lowestShareUsed :\n"},{"Del":" a_->highestLocalPriority != b_->highestLocalPriority ? a_->highestLocalPriority > b_->highestLocalPriority :\n"},{"Del":" a_->lowestBuildID < b_->lowestBuildID;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":14628},"path":"src/hydra-queue-runner/dispatcher.cc","line":230,"ins":{"up_context":[{"change":4,"pos":1178}],"down_context":[{"change":4,"pos":1227}],"flag":"BLOCK","start":1805,"end":1902,"inode":{"change":4,"pos":14628}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1178},"to":{"change":4,"start":1178,"end":1227},"introduced_by":4}],"inode":{"change":4,"pos":14628}},"ins_contents":[{"Add":" for (auto & stepInfo : runnableSorted) {"},{"Add":" auto & step(stepInfo.step);"}],"del_contents":[{"Del":" for (auto & step : runnableSorted) {\n"}]}},{"Edit":{"inode":{"change":12,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":173,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2151},"to":{"change":4,"start":4447,"end":4565},"introduced_by":4}],"inode":{"change":12,"pos":1128}}},"contents":[{"Del":"\n /* The lowest share used of any jobset depending on this\n step. */\n double lowestShareUsed;\n"}]}}],"owner":"grahamc","repo":"hydra2","token":"isAmW0T85yN3/+bhJZMAVslJ1uByKI4KEBs3I+BbEAo=","login":null}

…

Dependencies

Change contents