diff src/parallel_execution/main.c @ 113:d05b9937aa95

Change element data from Task to Data
author Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp>
date Tue, 07 Jun 2016 18:43:21 +0900
parents e3cba827d489
children 0f0459653d77
line wrap: on
line diff
--- a/src/parallel_execution/main.c	Tue May 03 17:29:21 2016 +0900
+++ b/src/parallel_execution/main.c	Tue Jun 07 18:43:21 2016 +0900
@@ -14,7 +14,7 @@
 
 void print_queue(struct Element* element) {
     while (element) {
-        printf("%d\n", element->task->key);
+        printf("%d\n", ((struct Task *)(element->data))->key);
         element = element->next;
     }
 }
@@ -52,7 +52,7 @@
     int i = loopCounter->i;
 
     if (i < length) {
-        //        printf("%d\n", array->array[i]);
+           printf("%d\n", array->array[i]);
         if (array->array[i] == (i*2)) {
             loopCounter->i++;
             goto meta(context, Code2);
@@ -129,7 +129,7 @@
 }
 
 __code createTask3(struct Context* context, struct Allocate* allocate) {
-    allocate->size = sizeof(struct OdsQueue);
+    allocate->size = sizeof(struct Queue);
     allocator(context);
     goto meta(context, CreateTask4);
 }
@@ -160,7 +160,7 @@
     task->waitI = waitI;
     task->idsCount = 0;
 
-    element->task = task;
+    element->data = (union Data *)task;
 
     context->next = CreateData1;
     loopCounter->i++;
@@ -188,7 +188,7 @@
 //    task->waitI = waitI;
 //    task->idsCount = 1;
 //
-//    element->task = task;
+//    element->data = (union Data *)task;
 //
 //    context->next = CreateData1;
 //    loopCounter->i++;
@@ -211,7 +211,7 @@
 //
 //    task->code = TaskB;
 //    task->key = i;
-//    element->task = task;
+//    element->data = (union Data *)task;
 //
 //    context->next = CreateData1;
 //    loopCounter->i++;
@@ -237,7 +237,7 @@
 }
 
 __code putQueue2(struct Context* context, struct Element* new_element, struct Element* element, struct Queue* queue) {
-    new_element->task = element->task;
+    new_element->data = element->data;
 
     if (queue->first)
         goto meta(context, PutQueue3);