diff src/parallel_execution/main.c @ 185:247a2c4a8908

fix compile errors
author mir3636
date Thu, 15 Dec 2016 18:10:48 +0900
parents 57a11c15ff4c
children dbc064c26b98
line wrap: on
line diff
--- a/src/parallel_execution/main.c	Thu Dec 15 17:41:00 2016 +0900
+++ b/src/parallel_execution/main.c	Thu Dec 15 18:10:48 2016 +0900
@@ -15,7 +15,7 @@
 
 void print_queue(struct Element* element) {
     while (element) {
-        printf("%d\n", ((struct Task *)(element->data)));
+        printf("%p\n", ((struct Task *)(element->data)));
         element = element->next;
     }
 }
@@ -180,7 +180,7 @@
 __code createWorker(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) {
     int i = loopCounter->i;
 
-    if (i < worker->num) {
+    if (i < worker->id) {
         struct Context* worker_context = &worker->contexts[i];
         worker_context->next = C_getTask1;
         worker_context->data[D_Tree] = context->data[D_Tree];
@@ -197,13 +197,13 @@
 }
 
 __code createWorker_stub(struct Context* context) {
-    goto createWorker(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->worker);
+    goto createWorker(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->Worker);
 }
 
 __code taskManager(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) {
     int i = loopCounter->i;
 
-    if (i < worker->num) {
+    if (i < worker->id) {
         pthread_join(worker->contexts[i].thread, NULL);
         loopCounter->i++;
 
@@ -218,7 +218,7 @@
 }
 
 __code taskManager_stub(struct Context* context) {
-    goto taskManager(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->worker);
+    goto taskManager(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->Worker);
 }
 
 void init(int argc, char** argv) {
@@ -247,8 +247,8 @@
 
     struct Context* worker_contexts = NEWN(cpu_num, struct Context);
 
-    struct Worker* worker = &main_context->data[D_Worker]->worker;
-    worker->num = cpu_num;
+    struct Worker* worker = &main_context->data[D_Worker]->Worker;
+    worker->id = cpu_num;
     worker->contexts = worker_contexts;
 
     for (int i = 0;i<cpu_num;i++)