Mercurial > hg > GearsTemplate

changeset 189:39d87ba6039d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author mir3636
date Fri, 16 Dec 2016 16:38:31 +0900
parents 6ab77dec8b6a
children af4dec989aa1
files src/parallel_execution/dependency.c src/parallel_execution/rb_tree.c src/parallel_execution/twice.c src/parallel_execution/worker.c
diffstat 4 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/dependency.c	Fri Dec 16 13:05:03 2016 +0900
+++ b/src/parallel_execution/dependency.c	Fri Dec 16 16:38:31 2016 +0900
@@ -10,7 +10,7 @@
 __code waitFor1(struct Context* context, struct Task* master, struct Task* slave, struct Element* element) {
     element->data = (union Data *)slave;
     // enqueue waitMe
-    goto meta_waitFor(context, /*master->waitMe*/ NULL , PutQueue1);
+    goto meta_waitFor(context, /*master->waitMe*/ NULL , /*PutQueue1*/ waitFor1);
 }
 
 __code waitFor1_stub(struct Context* context) {
--- a/src/parallel_execution/rb_tree.c	Fri Dec 16 13:05:03 2016 +0900
+++ b/src/parallel_execution/rb_tree.c	Fri Dec 16 16:38:31 2016 +0900
@@ -12,8 +12,8 @@
     redBlackTree->root = NULL;
     tree->put = C_putRedBlackTree;
     tree->get = C_getRedBlackTree;
-    tree->remove = C_removeRedBlackTree;
-    tree->clear = C_clearRedBlackTree;
+    // tree->remove = C_removeRedBlackTree;
+    // tree->clear = C_clearRedBlackTree;
     return (union Data*)(tree);
 }
 
--- a/src/parallel_execution/twice.c	Fri Dec 16 13:05:03 2016 +0900
+++ b/src/parallel_execution/twice.c	Fri Dec 16 16:38:31 2016 +0900
@@ -10,7 +10,7 @@
         array[i+index*prefix] = array[i+index*prefix]*2;
         loopCounter->i++;
 
-        goto meta(context, Twice);
+        goto meta(context, twice);
     }
 
     loopCounter->i = 0;
--- a/src/parallel_execution/worker.c	Fri Dec 16 13:05:03 2016 +0900
+++ b/src/parallel_execution/worker.c	Fri Dec 16 16:38:31 2016 +0900
@@ -5,10 +5,10 @@
 
 union Data* createWorker(struct Context* context) {
     struct Worker* worker = &ALLOCATE(context, Worker)->Worker;
-    worker->execute = C_executeWorker;
-    worker->taskSend = C_taskSendWorker;
-    worker->taskRecive = C_taskReciveWorker;
-    worker->shutdown = C_shutdownWorker;
+    // worker->execute = C_executeWorker;
+    // worker->taskSend = C_taskSendWorker;
+    // worker->taskRecive = C_taskReciveWorker;
+    // worker->shutdown = C_shutdownWorker;
     return (union Data*)(worker);
 }
 
@@ -18,16 +18,16 @@
 }
 
 __code getTask1_stub(struct Context* context) {
-    goto getTask1(context, &context->data[D_ActiveQueue]->Queue);
+    goto getTask1(context,/* &context->data[D_ActiveQueue]->Queue*/ NULL);
 }
 
 __code getTask2(struct Context* context, struct Task* task, struct Node* node) {
     context->next = C_getTask1;
-    goto meta(context, C_get);
+    goto meta(context, C_getTask2);
 }
 
 __code getTask2_stub(struct Context* context) {
-    goto getTask2(context, &(context->data[D_ActiveQueue]->Queue.data->Task), &context->data[D_Node]->node);
+    goto getTask2(context, /*&(context->data[D_ActiveQueue]->Queue.data->Task)*/ NULL, &context->data[D_Node]->node);
 }
 
 #ifdef USE_CUDA