Mercurial > hg > GearsTemplate
changeset 148:473b7d990a1f
fix data gears type enum
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Thu, 10 Nov 2016 12:07:53 +0900 |
parents | f2275f5777f4 |
children | 63ab65b28466 |
files | src/parallel_execution/allocate.c src/parallel_execution/context.c src/parallel_execution/context.h src/parallel_execution/dependency.c src/parallel_execution/main.c src/parallel_execution/rb_tree.c src/parallel_execution/stack.c src/parallel_execution/time.c src/parallel_execution/twice.c src/parallel_execution/worker.c |
diffstat | 10 files changed, 124 insertions(+), 124 deletions(-) [+] |
line wrap: on
line diff
--- a/src/parallel_execution/allocate.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/allocate.c Thu Nov 10 12:07:53 2016 +0900 @@ -3,7 +3,7 @@ union Data* allocator(struct Context* context) { context->data[++context->dataNum] = context->heap; - context->heap += context->data[Allocate]->allocate.size; + context->heap += context->data[D_Allocate]->allocate.size; return context->data[context->dataNum]; } @@ -14,5 +14,5 @@ } __code allocator_stub(struct Context* context) { - goto allocatorCS(context, &context->data[Allocate]->allocate); + goto allocatorCS(context, &context->data[D_Allocate]->allocate); }
--- a/src/parallel_execution/context.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/context.c Thu Nov 10 12:07:53 2016 +0900 @@ -178,5 +178,5 @@ waitQueue->last = 0; waitQueue->count = 0; - context->dataNum = Queue; + context->dataNum = D_Queue; }
--- a/src/parallel_execution/context.h Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/context.h Thu Nov 10 12:07:53 2016 +0900 @@ -12,22 +12,22 @@ #define ALLOC_DATA(context, dseg) ({\ struct Meta* meta = (struct Meta*)context->heap;\ - meta->type = dseg;\ + meta->type = D_##dseg;\ context->heap += sizeof(struct Meta);\ - context->data[dseg] = context->heap; context->heap += sizeof(struct dseg); (struct dseg *)context->data[dseg]; }) + context->data[D_##dseg] = context->heap; context->heap += sizeof(struct dseg); (struct dseg *)context->data[D_##dseg]; }) #define ALLOC_DATA_TYPE(context, dseg, t) ({\ struct Meta* meta = (struct Meta*)context->heap;\ - meta->type = t;\ + meta->type = D_##t;\ context->heap += sizeof(struct Meta);\ - context->data[dseg] = context->heap; context->heap += sizeof(struct t); (struct t *)context->data[dseg]; }) + context->data[D_##dseg] = context->heap; context->heap += sizeof(struct t); (struct t *)context->data[D_##dseg]; }) #define ALLOCATE(context, t) ({ \ struct Meta* meta = (struct Meta*)context->heap;\ context->heap += sizeof(struct Meta);\ union Data* data = context->heap; \ context->heap += sizeof(struct t); \ - meta->type = t; \ + meta->type = D_##t; \ data; }) #define GET_TYPE(dseg) ({ \ @@ -111,20 +111,20 @@ }; enum DataType { - Worker, - Allocate, - SingleLinkedStack, - Stack, - Tree, - Traverse, - RotateTree, - Node, - LoopCounter, - Time, - Element, - ActiveQueue, - WaitQueue, - Queue + D_Worker, + D_Allocate, + D_SingleLinkedStack, + D_Stack, + D_Tree, + D_Traverse, + D_RotateTree, + D_Node, + D_LoopCounter, + D_Time, + D_Element, + D_ActiveQueue, + D_WaitQueue, + D_Queue }; struct Context {
--- a/src/parallel_execution/dependency.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/dependency.c Thu Nov 10 12:07:53 2016 +0900 @@ -3,7 +3,7 @@ #include "origin_cs.h" __code meta_waitFor(struct Context* context, struct Queue* queue, enum Code next) { - context->data[Queue] = (union Data *)queue; + context->data[D_Queue] = (union Data *)queue; goto (context->code[next])(context); } @@ -29,7 +29,7 @@ //} __code meta_spawnTask(struct Context* context, struct Queue* queue, enum Code next) { - context->data[Queue] = (union Data *)queue; + context->data[D_Queue] = (union Data *)queue; goto (context->code[next])(context); } @@ -50,9 +50,9 @@ __code spawnTask_stub(struct Context* context) { goto spawnTask(context, &context->data[context->dataNum-2]->task, - &context->data[Element]->element, - &context->data[ActiveQueue]->queue, - &context->data[WaitQueue]->queue); + &context->data[D_Element]->element, + &context->data[D_ActiveQueue]->queue, + &context->data[D_WaitQueue]->queue); } __code taskA(struct Context* context) {
--- a/src/parallel_execution/main.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/main.c Thu Nov 10 12:07:53 2016 +0900 @@ -40,7 +40,7 @@ context->next = CreateWorker; - struct Time *t = &context->data[Time]->time; + struct Time *t = &context->data[D_Time]->time; t->next = CreateWorker; goto meta(context, StartTime); } @@ -66,7 +66,7 @@ } __code code2_stub(struct Context* context) { - goto code2(context, &context->data[Node]->node.value->array, &context->data[LoopCounter]->loopCounter); + goto code2(context, &context->data[D_Node]->node.value->array, &context->data[D_LoopCounter]->loopCounter); } __code createData1(struct Context* context, struct Allocate* allocate, struct LoopCounter* loopCounter) { @@ -84,7 +84,7 @@ } __code createData1_stub(struct Context* context) { - goto createData1(context, &context->data[Allocate]->allocate, &context->data[LoopCounter]->loopCounter); + goto createData1(context, &context->data[D_Allocate]->allocate, &context->data[D_LoopCounter]->loopCounter); } __code createData2(struct Context* context, struct LoopCounter* loopCounter, struct Array* array, struct Node* node) { @@ -104,9 +104,9 @@ __code createData2_stub(struct Context* context) { goto createData2(context, - &context->data[LoopCounter]->loopCounter, + &context->data[D_LoopCounter]->loopCounter, &context->data[context->dataNum]->array, - &context->data[Node]->node); + &context->data[D_Node]->node); } __code createTask1(struct Context* context, struct Allocate* allocate) { @@ -116,7 +116,7 @@ } __code createTask1_stub(struct Context* context) { - goto createTask1(context, &context->data[Allocate]->allocate); + goto createTask1(context, &context->data[D_Allocate]->allocate); } __code createTask2(struct Context* context, struct Allocate* allocate) { @@ -126,7 +126,7 @@ } __code createTask2_stub(struct Context* context) { - goto createTask2(context, &context->data[Allocate]->allocate); + goto createTask2(context, &context->data[D_Allocate]->allocate); } __code createTask3(struct Context* context, struct Allocate* allocate) { @@ -136,11 +136,11 @@ } __code createTask3_stub(struct Context* context) { - goto createTask3(context, &context->data[Allocate]->allocate); + goto createTask3(context, &context->data[D_Allocate]->allocate); } __code meta_createTask4(struct Context* context, struct Queue* activeQueue, enum Code next) { - context->data[Queue] = (union Data *)activeQueue; + context->data[D_Queue] = (union Data *)activeQueue; goto (context->code[next])(context); } @@ -171,12 +171,12 @@ __code createTask4_stub(struct Context* context) { goto createTask4(context, - &context->data[LoopCounter]->loopCounter, + &context->data[D_LoopCounter]->loopCounter, &context->data[context->dataNum-2]->task, &context->data[context->dataNum-1]->queue, &context->data[context->dataNum]->queue, - &context->data[Element]->element, - &context->data[ActiveQueue]->queue); + &context->data[D_Element]->element, + &context->data[D_ActiveQueue]->queue); } @@ -234,7 +234,7 @@ } __code putQueue1_stub(struct Context* context) { - goto putQueue1(context, &context->data[Allocate]->allocate); + goto putQueue1(context, &context->data[D_Allocate]->allocate); } __code putQueue2(struct Context* context, struct Element* new_element, struct Element* element, struct Queue* queue) { @@ -249,8 +249,8 @@ __code putQueue2_stub(struct Context* context) { goto putQueue2(context, &context->data[context->dataNum]->element, - &context->data[Element]->element, - &context->data[Queue]->queue); + &context->data[D_Element]->element, + &context->data[D_Queue]->queue); } __code putQueue3(struct Context* context, struct Queue* queue, struct Element* new_element) { @@ -267,7 +267,7 @@ } __code putQueue3_stub(struct Context* context) { - goto putQueue3(context, &context->data[Queue]->queue, &context->data[context->dataNum]->element); + goto putQueue3(context, &context->data[D_Queue]->queue, &context->data[context->dataNum]->element); } __code putQueue4(struct Context* context, struct Queue* queue, struct Element* new_element) { @@ -282,7 +282,7 @@ } __code putQueue4_stub(struct Context* context) { - goto putQueue4(context, &context->data[Queue]->queue, &context->data[context->dataNum]->element); + goto putQueue4(context, &context->data[D_Queue]->queue, &context->data[context->dataNum]->element); } __code createWorker(struct Context* context, struct LoopCounter* loopCounter, struct Worker* worker) { @@ -291,8 +291,8 @@ if (i < worker->num) { struct Context* worker_context = &worker->contexts[i]; worker_context->next = GetQueue; - worker_context->data[Tree] = context->data[Tree]; - worker_context->data[ActiveQueue] = context->data[ActiveQueue]; + worker_context->data[D_Tree] = context->data[D_Tree]; + 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++; @@ -305,7 +305,7 @@ } __code createWorker_stub(struct Context* context) { - goto createWorker(context, &context->data[LoopCounter]->loopCounter, &context->data[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) { @@ -320,13 +320,13 @@ loopCounter->i = 0; - struct Time *t = &context->data[Time]->time; + struct Time *t = &context->data[D_Time]->time; t->next = C_code2; goto meta(context, EndTime); } __code taskManager_stub(struct Context* context) { - goto taskManager(context, &context->data[LoopCounter]->loopCounter, &context->data[Worker]->worker); + goto taskManager(context, &context->data[D_LoopCounter]->loopCounter, &context->data[D_Worker]->worker); } void init(int argc, char** argv) { @@ -355,7 +355,7 @@ struct Context* worker_contexts = NEWN(cpu_num, struct Context); - struct Worker* worker = &main_context->data[Worker]->worker; + struct Worker* worker = &main_context->data[D_Worker]->worker; worker->num = cpu_num; worker->contexts = worker_contexts;
--- a/src/parallel_execution/rb_tree.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/rb_tree.c Thu Nov 10 12:07:53 2016 +0900 @@ -40,11 +40,11 @@ __code put_stub(struct Context* context) { struct Node* newNode = &ALLOCATE(context, Node)->node; goto put(context, - &context->data[Stack]->stack, - &context->data[Tree]->tree, - &context->data[Node]->node, - &context->data[Traverse]->traverse, - context->data[Tree]->tree.root, + &context->data[D_Stack]->stack, + &context->data[D_Tree]->tree, + &context->data[D_Node]->node, + &context->data[D_Traverse]->traverse, + context->data[D_Tree]->tree.root, newNode ); } @@ -60,10 +60,10 @@ __code replaceNode_stub(struct Context* context) { goto replaceNode(context, - &context->data[Traverse]->traverse, - context->data[Traverse]->traverse.current, - context->data[Traverse]->traverse.newNode, - &context->data[Stack]->stack); + &context->data[D_Traverse]->traverse, + context->data[D_Traverse]->traverse.current, + context->data[D_Traverse]->traverse.newNode, + &context->data[D_Stack]->stack); } __code replaceNode1(struct Context* context, struct Traverse* traverse, struct Node* node, struct Node* oldNode, struct Node* newNode, struct Node* newnewNode, int result) { @@ -90,12 +90,12 @@ __code replaceNode1_stub(struct Context* context) { struct Node* newnewNode = &ALLOCATE(context, Node)->node; goto replaceNode1(context, - &context->data[Traverse]->traverse, - &context->data[Node]->node, - context->data[Traverse]->traverse.current, - context->data[Traverse]->traverse.previous, + &context->data[D_Traverse]->traverse, + &context->data[D_Node]->node, + context->data[D_Traverse]->traverse.current, + context->data[D_Traverse]->traverse.previous, newnewNode, - context->data[Traverse]->traverse.result); + context->data[D_Traverse]->traverse.result); } __code insertNode(struct Context* context, struct Traverse* traverse, struct Stack *nodeStack, struct Node* node, struct Node* newNode) { @@ -109,10 +109,10 @@ __code insertNode_stub(struct Context* context) { goto insertNode(context, - &context->data[Traverse]->traverse, - &context->data[Stack]->stack, - &context->data[Node]->node, - context->data[Traverse]->traverse.newNode); + &context->data[D_Traverse]->traverse, + &context->data[D_Stack]->stack, + &context->data[D_Node]->node, + context->data[D_Traverse]->traverse.newNode); } __code insertCase1(struct Context* context,struct Traverse* traverse, struct Tree* tree,struct Node *parent, struct Node *grandparent) { @@ -127,10 +127,10 @@ __code insertCase1_stub(struct Context* context) { goto insertCase1(context, - &context->data[Traverse]->traverse, - &context->data[Tree]->tree, - &context->data[Stack]->stack.data->node, - &context->data[Stack]->stack.data1->node); + &context->data[D_Traverse]->traverse, + &context->data[D_Tree]->tree, + &context->data[D_Stack]->stack.data->node, + &context->data[D_Stack]->stack.data1->node); } __code insertCase2(struct Context* context, struct Traverse* traverse) { @@ -141,7 +141,7 @@ } __code insertCase2_stub(struct Context* context) { - goto insertCase2(context, &context->data[Traverse]->traverse); + goto insertCase2(context, &context->data[D_Traverse]->traverse); } __code insertCase3(struct Context* context, struct Traverse* traverse, struct Stack* nodeStack) { @@ -166,8 +166,8 @@ } __code insertCase3_stub(struct Context* context) { - goto insertCase3(context, &context->data[Traverse]->traverse, - &context->data[Stack]->stack + goto insertCase3(context, &context->data[D_Traverse]->traverse, + &context->data[D_Stack]->stack ); } @@ -200,7 +200,7 @@ } __code insertCase4_stub(struct Context* context) { - goto insertCase4(context, &context->data[Traverse]->traverse, &context->data[RotateTree]->rotateTree); + goto insertCase4(context, &context->data[D_Traverse]->traverse, &context->data[D_RotateTree]->rotateTree); } __code insertCase5(struct Context* context, struct Traverse* traverse,struct Stack *nodeStack) { @@ -210,7 +210,7 @@ } __code insertCase5_stub(struct Context* context) { - goto insertCase5(context, &context->data[Traverse]->traverse, &context->data[Stack]->stack); + goto insertCase5(context, &context->data[D_Traverse]->traverse, &context->data[D_Stack]->stack); } __code insertCase51(struct Context* context, struct Traverse* traverse, struct RotateTree *rotateTree, struct Node* current, struct Node* parent, struct Node* grandparent) { @@ -232,9 +232,9 @@ } __code insertCase51_stub(struct Context* context) { - struct Node* parent = &context->data[Stack]->stack.data->node; - struct Node* grandparent = &context->data[Stack]->stack.data1->node; - goto insertCase51(context, &context->data[Traverse]->traverse,&context->data[RotateTree]->rotateTree, context->data[Traverse]->traverse.current, parent, grandparent); + struct Node* parent = &context->data[D_Stack]->stack.data->node; + struct Node* grandparent = &context->data[D_Stack]->stack.data1->node; + goto insertCase51(context, &context->data[D_Traverse]->traverse,&context->data[D_RotateTree]->rotateTree, context->data[D_Traverse]->traverse.current, parent, grandparent); } __code rotateLeft(struct Context* context, struct Traverse* traverse,struct Stack* nodeStack) { @@ -244,8 +244,8 @@ } __code rotateLeft_stub(struct Context* context) { - struct Traverse* traverse = context->data[RotateTree]->rotateTree.traverse; - goto rotateLeft(context, traverse, &context->data[Stack]->stack); + struct Traverse* traverse = context->data[D_RotateTree]->rotateTree.traverse; + goto rotateLeft(context, traverse, &context->data[D_Stack]->stack); } __code rotateLeft1(struct Context* context, struct Node* node, struct Tree* tree, struct Traverse* traverse, struct Node *parent,struct RotateTree *rotateTree) { @@ -268,14 +268,14 @@ } __code rotateLeft1_stub(struct Context* context) { - struct Traverse* traverse = context->data[RotateTree]->rotateTree.traverse; - struct Node* parent = &context->data[Stack]->stack.data->node; + struct Traverse* traverse = context->data[D_RotateTree]->rotateTree.traverse; + struct Node* parent = &context->data[D_Stack]->stack.data->node; goto rotateLeft1(context, traverse->current, - &context->data[Tree]->tree, + &context->data[D_Tree]->tree, traverse, parent, - &context->data[RotateTree]->rotateTree); + &context->data[D_RotateTree]->rotateTree); } __code rotateRight(struct Context* context, struct Traverse* traverse,struct Stack *nodeStack) { @@ -285,8 +285,8 @@ } __code rotateRight_stub(struct Context* context) { - struct Traverse* traverse = context->data[RotateTree]->rotateTree.traverse; - goto rotateLeft(context, traverse, &context->data[Stack]->stack); + struct Traverse* traverse = context->data[D_RotateTree]->rotateTree.traverse; + goto rotateLeft(context, traverse, &context->data[D_Stack]->stack); } __code rotateRight1(struct Context* context, struct Node* node, struct Tree* tree, struct Traverse* traverse,struct Node *parent,struct RotateTree *rotateTree) { @@ -309,14 +309,14 @@ } __code rotateRight1_stub(struct Context* context) { - struct Traverse* traverse = context->data[RotateTree]->rotateTree.traverse; - struct Node* parent = &context->data[Stack]->stack.data->node; + struct Traverse* traverse = context->data[D_RotateTree]->rotateTree.traverse; + struct Node* parent = &context->data[D_Stack]->stack.data->node; goto rotateRight1(context, traverse->current, - &context->data[Tree]->tree, + &context->data[D_Tree]->tree, traverse, parent, - &context->data[RotateTree]->rotateTree); + &context->data[D_RotateTree]->rotateTree); } __code stackClear(struct Context* context, struct Traverse* traverse,struct Stack *nodeStack) { @@ -327,7 +327,7 @@ } __code stackClear_stub(struct Context* context) { - goto stackClear(context, &context->data[Traverse]->traverse,&context->data[Stack]->stack); + goto stackClear(context, &context->data[D_Traverse]->traverse,&context->data[D_Stack]->stack); } @@ -342,7 +342,7 @@ } __code get_stub(struct Context* context) { - goto get(context, &context->data[Tree]->tree, &context->data[Traverse]->traverse); + goto get(context, &context->data[D_Tree]->tree, &context->data[D_Traverse]->traverse); } __code search(struct Context* context, struct Traverse* traverse, struct Node* node) { @@ -365,7 +365,7 @@ } __code search_stub(struct Context* context) { - goto search(context, &context->data[Traverse]->traverse, &context->data[Node]->node); + goto search(context, &context->data[D_Traverse]->traverse, &context->data[D_Node]->node); } /* /\* __code delete(struct Context* context, struct Tree* tree) { *\/ */
--- a/src/parallel_execution/stack.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/stack.c Thu Nov 10 12:07:53 2016 +0900 @@ -39,7 +39,7 @@ } __code clearSingleLinkedStack_stub(struct Context* context) { - goto clearSingleLinkedStack(context, (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, context->data[Stack]->stack.next); + goto clearSingleLinkedStack(context, (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, context->data[D_Stack]->stack.next); } __code pushSingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, struct Element* element, union Data* data, enum Code next) { @@ -52,10 +52,10 @@ __code pushSingleLinkedStack_stub(struct Context* context) { struct Element* element = &ALLOCATE(context, Element)->element; goto pushSingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, element, - context->data[Stack]->stack.data, - context->data[Stack]->stack.next); + context->data[D_Stack]->stack.data, + context->data[D_Stack]->stack.next); } __code popSingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, union Data** data, enum Code next) { @@ -70,9 +70,9 @@ __code popSingleLinkedStack_stub(struct Context* context) { goto popSingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, - &context->data[Stack]->stack.data, - context->data[Stack]->stack.next); + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, + &context->data[D_Stack]->stack.data, + context->data[D_Stack]->stack.next); } __code pop2SingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, union Data** data, union Data** data1, enum Code next) { @@ -93,10 +93,10 @@ __code pop2SingleLinkedStack_stub(struct Context* context) { goto pop2SingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, - &context->data[Stack]->stack.data, - &context->data[Stack]->stack.data1, - context->data[Stack]->stack.next); + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, + &context->data[D_Stack]->stack.data, + &context->data[D_Stack]->stack.data1, + context->data[D_Stack]->stack.next); } __code getSingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, union Data** data, enum Code next) { @@ -109,9 +109,9 @@ __code getSingleLinkedStack_stub(struct Context* context) { goto getSingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, - &context->data[Stack]->stack.data, - context->data[Stack]->stack.next); + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, + &context->data[D_Stack]->stack.data, + context->data[D_Stack]->stack.next); } __code get2SingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, union Data** data, union Data** data1, enum Code next) { @@ -131,10 +131,10 @@ __code get2SingleLinkedStack_stub(struct Context* context) { goto get2SingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, - &context->data[Stack]->stack.data, - &context->data[Stack]->stack.data1, - context->data[Stack]->stack.next); + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, + &context->data[D_Stack]->stack.data, + &context->data[D_Stack]->stack.data1, + context->data[D_Stack]->stack.next); } __code isEmptySingleLinkedStack(struct Context* context, struct SingleLinkedStack* stack, enum Code next,enum Code whenEmpty) { @@ -146,8 +146,8 @@ __code isEmptySingleLinkedStack_stub(struct Context* context) { goto isEmptySingleLinkedStack(context, - (struct SingleLinkedStack *)context->data[Stack]->stack.stack->stack.stack, - context->data[Stack]->stack.next, - context->data[Stack]->stack.whenEmpty); + (struct SingleLinkedStack *)context->data[D_Stack]->stack.stack->stack.stack, + context->data[D_Stack]->stack.next, + context->data[D_Stack]->stack.whenEmpty); }
--- a/src/parallel_execution/time.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/time.c Thu Nov 10 12:07:53 2016 +0900 @@ -14,7 +14,7 @@ } __code start_time_stub(struct Context* context) { - goto start_time(context, &context->data[Time]->time); + goto start_time(context, &context->data[D_Time]->time); } __code end_time(struct Context* context, struct Time* time) { @@ -27,5 +27,5 @@ } __code end_time_stub(struct Context* context) { - goto end_time(context, &context->data[Time]->time); + goto end_time(context, &context->data[D_Time]->time); }
--- a/src/parallel_execution/twice.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/twice.c Thu Nov 10 12:07:53 2016 +0900 @@ -21,8 +21,8 @@ __code twice_stub(struct Context* context) { goto twice(context, - &context->data[LoopCounter]->loopCounter, - context->data[Node]->node.value->array.index, - context->data[Node]->node.value->array.prefix, - context->data[Node]->node.value->array.array); + &context->data[D_LoopCounter]->loopCounter, + context->data[D_Node]->node.value->array.index, + context->data[D_Node]->node.value->array.prefix, + context->data[D_Node]->node.value->array.array); }
--- a/src/parallel_execution/worker.c Thu Nov 10 10:35:48 2016 +0900 +++ b/src/parallel_execution/worker.c Thu Nov 10 12:07:53 2016 +0900 @@ -14,7 +14,7 @@ context->next = GetQueue; node->key = ((struct Task *)(first->data))->key; - struct Traverse *t = &context->data[Traverse]->traverse; + struct Traverse *t = &context->data[D_Traverse]->traverse; t->next = ((struct Task *)(first->data))->code; goto meta(context, C_get); } else { @@ -23,7 +23,7 @@ } __code getQueue_stub(struct Context* context) { - goto getQueue(context, &context->data[ActiveQueue]->queue, &context->data[Node]->node); + goto getQueue(context, &context->data[D_ActiveQueue]->queue, &context->data[D_Node]->node); } #ifdef USE_CUDA