Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

add named getters to RunSet

Browse Source 
this improves readability by removing the index-based
get<> methods in favour of explicitly named methods
This commit is contained in:
Oliver Giles 2017-12-20 09:02:12 +02:00
parent bb9486e066
commit e0a130f33d
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/laminar.cpp
View File

@ -210,7 +210,7 @@ void Laminar::sendStatus(LaminarClient* client) {
}); });
j.EndArray(); j.EndArray();
j.startArray("running"); j.startArray("running");
auto p = activeJobs.get<4>().equal_range(client->scope.job); auto p = activeJobs.byJobName().equal_range(client->scope.job);
for(auto it = p.first; it != p.second; ++it) { for(auto it = p.first; it != p.second; ++it) {
const std::shared_ptr<Run> run = *it; const std::shared_ptr<Run> run = *it;
j.StartObject(); j.StartObject();
@ -263,7 +263,7 @@ void Laminar::sendStatus(LaminarClient* client) {
}); });
j.EndArray(); j.EndArray();
j.startArray("running"); j.startArray("running");
for(const std::shared_ptr<Run> run : activeJobs.get<3>()) { for(const std::shared_ptr<Run> run : activeJobs.byStartedAt()) {
j.StartObject(); j.StartObject();
j.set("name", run->name); j.set("name", run->name);
j.set("number", run->build); j.set("number", run->build);
@ -292,7 +292,7 @@ void Laminar::sendStatus(LaminarClient* client) {
}); });
j.EndArray(); j.EndArray();
j.startArray("running"); j.startArray("running");
for(const std::shared_ptr<Run> run : activeJobs.get<3>()) { for(const std::shared_ptr<Run> run : activeJobs.byStartedAt()) {
j.StartObject(); j.StartObject();
j.set("name", run->name); j.set("name", run->name);
j.set("number", run->build); j.set("number", run->build);
@ -528,7 +528,7 @@ void Laminar::reapAdvance() {
static thread_local char buf[1024]; static thread_local char buf[1024];
while((pid = waitpid(-1, &ret, WNOHANG)) > 0) { while((pid = waitpid(-1, &ret, WNOHANG)) > 0) {
LLOG(INFO, "Reaping", pid); LLOG(INFO, "Reaping", pid);
auto it = activeJobs.get<0>().find(pid); auto it = activeJobs.byPid().find(pid);
std::shared_ptr<Run> run = *it; std::shared_ptr<Run> run = *it;
// The main event loop might schedule this SIGCHLD handler before the final // The main event loop might schedule this SIGCHLD handler before the final
// output handler (from addDescriptor). In that case, because it keeps a // output handler (from addDescriptor). In that case, because it keeps a
@ -539,7 +539,7 @@ void Laminar::reapAdvance() {
handleRunLog(run, std::string(buf, n)); handleRunLog(run, std::string(buf, n));
} }
bool completed = true; bool completed = true;
activeJobs.get<0>().modify(it, [&](std::shared_ptr<Run> run){ activeJobs.byPid().modify(it, [&](std::shared_ptr<Run> run){
run->reaped(ret); run->reaped(ret);
completed = stepRun(run); completed = stepRun(run);
}); });
@ -770,7 +770,7 @@ void Laminar::runFinished(Run * r) {
} }
// erase reference to run from activeJobs // erase reference to run from activeJobs
activeJobs.get<2>().erase(r); activeJobs.byRunPtr().erase(r);
// remove old run directories // remove old run directories
// We cannot count back the number of directories to keep from the currently // We cannot count back the number of directories to keep from the currently
@ -780,7 +780,7 @@ void Laminar::runFinished(Run * r) {
// from the oldest among them. If there are none, count back from the latest // from the oldest among them. If there are none, count back from the latest
// known build number of this job, which may not be that of the run that // known build number of this job, which may not be that of the run that
// finished here. // finished here.
auto it = activeJobs.get<4>().equal_range(r->name); auto it = activeJobs.byJobName().equal_range(r->name);
uint oldestActive = (it.first == it.second)? buildNums[r->name] : (*it.first)->build - 1; uint oldestActive = (it.first == it.second)? buildNums[r->name] : (*it.first)->build - 1;
for(int i = oldestActive - numKeepRunDirs; i > 0; i--) { for(int i = oldestActive - numKeepRunDirs; i > 0; i--) {
fs::path d = fs::path(homeDir)/"run"/r->name/std::to_string(i); fs::path d = fs::path(homeDir)/"run"/r->name/std::to_string(i);

4
src/laminar.h
View File

@ -69,8 +69,8 @@ private:
void populateArtifacts(Json& out, std::string job, int num) const; void populateArtifacts(Json& out, std::string job, int num) const;
Run* activeRun(std::string name, int num) { Run* activeRun(std::string name, int num) {
auto it = activeJobs.get<1>().find(boost::make_tuple(name, num)); auto it = activeJobs.byRun().find(boost::make_tuple(name, num));
return it == activeJobs.get<1>().end() ? nullptr : it->get(); return it == activeJobs.byRun().end() ? nullptr : it->get();
} }
std::list<std::shared_ptr<Run>> queuedJobs; std::list<std::shared_ptr<Run>> queuedJobs;

15
src/run.h
View File

@ -147,7 +147,20 @@ struct RunSet: public boost::multi_index_container<
std::shared_ptr<Run>, std::shared_ptr<Run>,
_run_index _run_index
> { > {
// TODO: getters for each index typename bmi::nth_index<RunSet, 0>::type& byPid() { return get<0>(); }
typename bmi::nth_index<RunSet, 0>::type const& byPid() const { return get<0>(); }
typename bmi::nth_index<RunSet, 1>::type& byRun() { return get<1>(); }
typename bmi::nth_index<RunSet, 1>::type const& byRun() const { return get<1>(); }
typename bmi::nth_index<RunSet, 2>::type& byRunPtr() { return get<2>(); }
typename bmi::nth_index<RunSet, 2>::type const& byRunPtr() const { return get<2>(); }
typename bmi::nth_index<RunSet, 3>::type& byStartedAt() { return get<3>(); }
typename bmi::nth_index<RunSet, 3>::type const& byStartedAt() const { return get<3>(); }
typename bmi::nth_index<RunSet, 4>::type& byJobName() { return get<4>(); }
typename bmi::nth_index<RunSet, 4>::type const& byJobName() const { return get<4>(); }
}; };
#endif // LAMINAR_RUN_H_ #endif // LAMINAR_RUN_H_