Mercurial > hg > Members > innparusu > Gears
diff src/parallel_execution/main.c @ 127:a574ba0da60f
add comment rb_tree
author | ikkun |
---|---|
date | Wed, 14 Sep 2016 20:43:37 +0900 |
parents | f57e9ffa7960 0f0459653d77 |
children | 337fdbffa693 |
line wrap: on
line diff
--- a/src/parallel_execution/main.c Wed Sep 14 20:35:21 2016 +0900 +++ b/src/parallel_execution/main.c Wed Sep 14 20:43:37 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); } @@ -143,7 +143,7 @@ goto (context->code[next])(context); } -__code createTask4(struct Context* context, struct LoopCounter* loopCounter, struct Task* task, struct Queue* waitMe, struct OdsQueue* waitI, struct Element* element, struct Queue* activeQueue) { +__code createTask4(struct Context* context, struct LoopCounter* loopCounter, struct Task* task, struct Queue* waitMe, struct Queue* waitI, struct Element* element, struct Queue* activeQueue) { int i = loopCounter->i; waitMe->first = 0; @@ -160,7 +160,7 @@ task->waitI = waitI; task->idsCount = 0; - element->task = task; + element->data = (union Data *)task; context->next = CreateData1; loopCounter->i++; @@ -173,7 +173,7 @@ &context->data[LoopCounter]->loopCounter, &context->data[context->dataNum-2]->task, &context->data[context->dataNum-1]->queue, - &context->data[context->dataNum]->odsQueue, + &context->data[context->dataNum]->queue, &context->data[Element]->element, &context->data[ActiveQueue]->queue); } @@ -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);