Commit 08644ca0 authored by EYRAUD-DUBOIS Lionel's avatar EYRAUD-DUBOIS Lionel

Merge branch 'master' into comms

parents 1d692d0f 4989b525
......@@ -134,7 +134,8 @@ void ExportAlloc::onSchedule(int i, int w, double s, double f) {
output << "TaskType: " << instance->taskTypeNames[instance->taskTypes[i]] << endl;
}
int type = instance->getType(w);
int index;
int type = instance->getType(w, &index);
if (outputType && instance->workerIDs[type].size() > 1) {
output << "Workers:";
......@@ -142,7 +143,7 @@ void ExportAlloc::onSchedule(int i, int w, double s, double f) {
output << " " << i;
output << endl;
} else {
output << "SpecificWorker: " << w << endl;
output << "SpecificWorker: " << instance->workerIDs[type][index] << endl;
if (workerOrder) {
output << "Workerorder: " << workerTaskCount[w] << endl;
++workerTaskCount[w];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment