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

add simple concurrent compilation

Browse Source 
using something similar to round-robin scheduling
This commit is contained in:
still-flow 2020-05-28 13:29:03 +03:00
parent eb5023cfbb
commit 61d824803c
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.simple
View File

@ -162,7 +162,7 @@ savepng$(OBJ_EXTENSION): savepng.cpp
$(CXX) -O2 $(CXXFLAGS) -c savepng.cpp -o $@ $(CXX) -O2 $(CXXFLAGS) -c savepng.cpp -o $@
mymake$(EXE_EXTENSION): mymake.cpp mymake$(EXE_EXTENSION): mymake.cpp
$(CXX) -O2 $(CXXFLAGS) mymake.cpp -o $@ $(CXX) -O2 $(CXXFLAGS) -lpthread mymake.cpp -o $@
emscripten: hyper.html emscripten: hyper.html

47
mymake.cpp
View File

@ -14,6 +14,8 @@
#include <vector> #include <vector>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <chrono>
#include <future>
using namespace std; using namespace std;
@ -27,6 +29,8 @@ string compiler;
string linker; string linker;
string libs; string libs;
int batch_size = 1;
void set_linux() { void set_linux() {
preprocessor = "g++ -E"; preprocessor = "g++ -E";
compiler = "g++ -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-implicit-fallthrough -rdynamic -fdiagnostics-color=always -c"; compiler = "g++ -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-implicit-fallthrough -rdynamic -fdiagnostics-color=always -c";
@ -129,6 +133,10 @@ int main(int argc, char **argv) {
standard = s; standard = s;
else if(s.substr(0, 2) == "-l") else if(s.substr(0, 2) == "-l")
linker += " " + s; linker += " " + s;
else if(s.substr(0, 2) == "-j")
if (s.length() == 2 || stoi(s.substr(2)) < 1)
batch_size = thread::hardware_concurrency() + 1;
else batch_size = stoi(s.substr(2));
else if(s == "-I") { else if(s == "-I") {
opts += " " + s + " " + argv[i+1]; opts += " " + s + " " + argv[i+1];
i++; i++;
@ -203,10 +211,10 @@ int main(int argc, char **argv) {
} }
string allobj = " " + obj_dir + "/hyper.o"; string allobj = " " + obj_dir + "/hyper.o";
int id = 0; int id = 0;
vector<pair<int, string>> tasks;
for(string m: modules) { for(string m: modules) {
id++;
string src = m + ".cpp"; string src = m + ".cpp";
string m2 = m; string m2 = m;
for(char& c: m2) if(c == '/') c = '_'; for(char& c: m2) if(c == '/') c = '_';
@ -218,14 +226,45 @@ 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) {
printf("compiling %s... [%d/%d]\n", m.c_str(), id, int(modules.size())); pair<int, string> task(id, compiler + " " + opts + " " + src + " -o " + obj);
if(system(compiler + " " + opts + " " + src + " -o " + obj)) { printf("error\n"); exit(1); } tasks.push_back(task);
} }
else { else {
printf("ok: %s\n", m.c_str()); printf("ok: %s\n", m.c_str());
} }
allobj += " "; allobj += " ";
allobj += obj; allobj += obj;
id++;
}
chrono::milliseconds quantum(25);
vector<future<int>> workers(batch_size);
int tasks_amt = tasks.size();
int tasks_taken = 0, tasks_done = 0;
bool finished = tasks.empty();
while (!finished)
for (auto & worker : workers) {
check_lollygagging:
if (worker.valid()) {
if (worker.wait_for(quantum) != future_status::ready) continue;
else {
int res = worker.get();
if (res) { printf("compilation error!\n"); exit(1); }
++tasks_done;
goto check_lollygagging;
}
}
else if (tasks_taken < tasks_amt) {
auto task = tasks[tasks_taken];
int mid = task.first;
string cmdline = task.second;
printf("compiling %s... [%d/%d]\n", modules[mid].c_str(), tasks_taken+1, tasks_amt);
worker = async(launch::async, (int (*)(string))system, cmdline);
++tasks_taken;
}
else if (tasks_done == tasks_amt) { finished = true; break; }
} }
printf("linking...\n"); printf("linking...\n");