# HG changeset patch # User mir3636 # Date 1483286497 -32400 # Node ID 962fbfe777bb81a24636e50d370f90f36fa693af # Parent ba56dab79dc45b5f9466493c3c8ed2a2b48ba16f temporarily change to createWorker1 diff -r ba56dab79dc4 -r 962fbfe777bb src/parallel_execution/CMakeLists.txt --- a/src/parallel_execution/CMakeLists.txt Tue Dec 27 17:13:45 2016 +0900 +++ b/src/parallel_execution/CMakeLists.txt Mon Jan 02 01:01:37 2017 +0900 @@ -23,19 +23,19 @@ TARGET twice SOURCES - main.c rb_tree.c stack.c origin_cs.c allocate.c compare.c worker.c dependency.c time.c twice.c stack.c queue.c + main.c rb_tree.c stack.c origin_cs.c allocate.c compare.c worker.c dependency.c time.c twice.c ) GearsCommand( TARGET stack_test SOURCES - rb_tree.c stack.c origin_cs.c allocate.c compare.c worker.c dependency.c time.c twice.c test/stack_test.c stack.c queue.c + origin_cs.c test/stack_test.c stack.c ) GearsCommand( TARGET queue_test SOURCES - TaskManager.c rb_tree.c stack.c origin_cs.c allocate.c compare.c worker.c dependency.c time.c twice.c stack.c test/queue_test.c queue.c + origin_cs.c test/queue_test.c queue.c ) diff -r ba56dab79dc4 -r 962fbfe777bb src/parallel_execution/main.c --- a/src/parallel_execution/main.c Tue Dec 27 17:13:45 2016 +0900 +++ b/src/parallel_execution/main.c Mon Jan 02 01:01:37 2017 +0900 @@ -38,10 +38,10 @@ /* print_tree(context->data[Tree]->tree.root); */ /* puts("result"); */ - context->next = C_createWorker; + context->next = C_createWorker1; struct Time *t = &context->data[D_Time]->Time; - t->next = C_createWorker; + t->next = C_createWorker1; goto meta(context, C_start_time); } @@ -177,7 +177,7 @@ // &context->data[Element]->element); //} -__code createWorker(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) { +__code createWorker1(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) { int i = loopCounter->i; if (i < worker->id) { @@ -189,15 +189,15 @@ worker_context->thread_num = i; loopCounter->i++; - goto meta(context, C_createWorker); + goto meta(context, C_createWorker1); } loopCounter->i = 0; goto meta(context, C_taskManager); } -__code createWorker_stub(struct Context* context) { - goto createWorker(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->Worker); +__code createWorker1_stub(struct Context* context) { + goto createWorker1(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->Worker); } __code taskManager(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) {