mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 06:50:27 +00:00
Code Issues Releases Wiki Activity

change tasks into pairs of ids and do_work functions

Browse Source
This commit is contained in:
still-flow 2020-05-28 20:41:42 +03:00
parent b2a930f0f6
commit 72008a7e85
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mymake.cpp
View File

@ -16,6 +16,7 @@
#include <unistd.h> #include <unistd.h>
#include <chrono> #include <chrono>
#include <future> #include <future>
#include <functional>
using namespace std; using namespace std;
@ -213,7 +214,7 @@ int main(int argc, char **argv) {
printf("compiling modules using batch size of %d:\n", batch_size); printf("compiling modules using batch size of %d:\n", batch_size);
int id = 0; int id = 0;
vector<pair<int, string>> tasks; vector<pair<int, function<int(void)>>> tasks;
for(string m: modules) { for(string m: modules) {
string src = m + ".cpp"; string src = m + ".cpp";
string m2 = m; string m2 = m;
@ -226,7 +227,8 @@ int main(int argc, char **argv) {
} }
time_t obj_time = get_file_time(obj); time_t obj_time = get_file_time(obj);
if(src_time > obj_time) { if(src_time > obj_time) {
pair<int, string> task(id, compiler + " " + opts + " " + src + " -o " + obj); string cmdline = compiler + " " + opts + " " + src + " -o " + obj;
pair<int, function<int(void)>> task(id, [cmdline]() { return system(cmdline); });
tasks.push_back(task); tasks.push_back(task);
} }
else { else {
@ -259,9 +261,9 @@ int main(int argc, char **argv) {
else if (tasks_taken < tasks_amt) { else if (tasks_taken < tasks_amt) {
auto task = tasks[tasks_taken]; auto task = tasks[tasks_taken];
int mid = task.first; int mid = task.first;
string cmdline = task.second; function<int(void)> do_work = task.second;
printf("compiling %s... [%d/%d]\n", modules[mid].c_str(), tasks_taken+1, tasks_amt); printf("compiling %s... [%d/%d]\n", modules[mid].c_str(), tasks_taken+1, tasks_amt);
worker = async(launch::async, (int (*)(string))system, cmdline); worker = async(launch::async, do_work);
++tasks_taken; ++tasks_taken;
} }
else if (tasks_done == tasks_amt) { finished = true; break; } else if (tasks_done == tasks_amt) { finished = true; break; }