Mercurial > hg > Gears > Gears

changeset 881:fc0a39161d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use MCTaskManagerImpl
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Sun, 24 Jan 2021 17:06:52 +0900
parents 5ce463171d86
children 24ba42caf425
files src/parallel_execution/CMakeLists.txt src/parallel_execution/MCTaskManagerImpl.cbc src/parallel_execution/examples/DPPMC/main.cbc
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/CMakeLists.txt	Sun Jan 24 16:18:34 2021 +0900
+++ b/src/parallel_execution/CMakeLists.txt	Sun Jan 24 17:06:52 2021 +0900
@@ -153,7 +153,7 @@
   TARGET
   DPPMC
   SOURCES
-  TaskManagerImpl.cbc CPUWorker.cbc SynchronizedQueue.cbc examples/DPPMC/AtomicTImpl.cbc SingleLinkedStack.cbc examples/DPPMC/PhilsImpl.cbc examples/DPPMC/main.cbc examples/DPPMC/ForkImpl.cbc ModelChecking/crc32.c ModelChecking/memory.c ModelChecking/state_db.c AtomicReference.cbc ModelChecking/MCWorker.cbc MCTaskManagerImpl.cbc
+  CPUWorker.cbc SynchronizedQueue.cbc examples/DPPMC/AtomicTImpl.cbc SingleLinkedStack.cbc examples/DPPMC/PhilsImpl.cbc examples/DPPMC/main.cbc examples/DPPMC/ForkImpl.cbc ModelChecking/crc32.c ModelChecking/memory.c ModelChecking/state_db.c AtomicReference.cbc ModelChecking/MCWorker.cbc MCTaskManagerImpl.cbc
 )
 
 GearsCommand(
--- a/src/parallel_execution/MCTaskManagerImpl.cbc	Sun Jan 24 16:18:34 2021 +0900
+++ b/src/parallel_execution/MCTaskManagerImpl.cbc	Sun Jan 24 17:06:52 2021 +0900
@@ -11,12 +11,12 @@
 
 TaskManager* createMCTaskManagerImpl(struct Context* context, int numCPU, int numGPU, int numIO) {
     struct TaskManager* taskManager = new TaskManager();
-    taskManager->spawnTasks = C_spawnTasksTaskManagerImpl;
-    taskManager->spawn = C_spawnTaskManagerImpl;
-    taskManager->shutdown  = C_shutdownTaskManagerImpl;
-    taskManager->incrementTaskCount = C_incrementTaskCountTaskManagerImpl;
-    taskManager->decrementTaskCount = C_decrementTaskCountTaskManagerImpl;
-    taskManager->setWaitTask = C_setWaitTaskTaskManagerImpl;
+    taskManager->spawnTasks = C_spawnTasksMCTaskManagerImpl;
+    taskManager->spawn = C_spawnMCTaskManagerImpl;
+    taskManager->shutdown  = C_shutdownMCTaskManagerImpl;
+    taskManager->incrementTaskCount = C_incrementTaskCountMCTaskManagerImpl;
+    taskManager->decrementTaskCount = C_decrementTaskCountMCTaskManagerImpl;
+    taskManager->setWaitTask = C_setWaitTaskMCTaskManagerImpl;
     struct MCTaskManagerImpl* taskManagerImpl = new MCTaskManagerImpl();
     // 0...numIO-1 IOProcessor
     // numIO...numIO+numGPU-1 GPUProcessor
--- a/src/parallel_execution/examples/DPPMC/main.cbc	Sun Jan 24 16:18:34 2021 +0900
+++ b/src/parallel_execution/examples/DPPMC/main.cbc	Sun Jan 24 17:06:52 2021 +0900
@@ -21,7 +21,7 @@
 __code initDataGears(struct LoopCounter* loopCounter, struct TaskManager* taskManager) {
     // loopCounter->tree = createRedBlackTree(context);
     loopCounter->i = 0;
-    taskManager->taskManager = (union Data*)createTaskManagerImpl(context, cpu_num, gpu_num, 0);
+    taskManager->taskManager = (union Data*)createMCTaskManagerImpl(context, cpu_num, gpu_num, 0);
     goto code1();
 }