diff src/parallel_execution/main.c @ 187:bacc37265386

main.o fixed
author mir3636
date Thu, 15 Dec 2016 19:51:40 +0900
parents dbc064c26b98
children 119c035e0e36
line wrap: on
line diff
--- a/src/parallel_execution/main.c	Thu Dec 15 19:38:18 2016 +0900
+++ b/src/parallel_execution/main.c	Thu Dec 15 19:51:40 2016 +0900
@@ -184,7 +184,7 @@
         struct Context* worker_context = &worker->contexts[i];
         worker_context->next = C_getTask1;
         worker_context->data[D_Tree] = context->data[D_Tree];
-        worker_context->data[D_ActiveQueue] = context->data[D_ActiveQueue];
+        // worker_context->data[D_ActiveQueue] = context->data[D_ActiveQueue];
         pthread_create(&worker_context->thread, NULL, (void*)&start_code, worker_context);
         worker_context->thread_num = i;
         loopCounter->i++;
@@ -193,7 +193,7 @@
     }
 
     loopCounter->i = 0;
-    goto meta(context, TaskManager);
+    goto meta(context, C_taskManager);
 }
 
 __code createWorker_stub(struct Context* context) {
@@ -207,14 +207,14 @@
         pthread_join(worker->contexts[i].thread, NULL);
         loopCounter->i++;
 
-        goto meta(context, TaskManager);
+        goto meta(context, C_taskManager);
     }
 
     loopCounter->i = 0;
 
     Time *t = &context->data[D_Time]->Time;
     t->next = C_code2;
-    goto meta(context, EndTime);
+    goto meta(context, C_end_time);
 }
 
 __code taskManager_stub(struct Context* context) {
@@ -243,7 +243,7 @@
 
     struct Context* main_context = NEW(struct Context);
     initContext(main_context);
-    main_context->next = CreateData1;
+    main_context->next = C_createData1;
 
     struct Context* worker_contexts = NEWN(cpu_num, struct Context);