Mercurial > hg > Game > Cerium

changeset 2056:1161466f4e1b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add FileMapReduce member variable to MapReduce w
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Sat, 30 Jan 2016 17:15:21 +0900
parents c62fbe66f549
children ce57fa0495a7
files TaskManager/ManyCore/FileMapReduce.cc TaskManager/ManyCore/FileMapReduce.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.cc	Fri Jan 29 19:51:40 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.cc	Sat Jan 30 17:15:21 2016 +0900
@@ -34,6 +34,7 @@
     this->TASK_EXEC = TASK_EXEC;
     this->TASK_EXEC_DATA_PARALLEL = TASK_EXEC_DATA_PARALLEL;
     this->TASK_PRINT = TASK_PRINT;
+    w = NULL;
     fmp_help_str = "[-a -c -s] [-cpu spe_num] [-g] [-file filename] [-br]\n";
 }
 
@@ -375,7 +376,7 @@
         return ;
     }
 
-    MapReducePtr w = (MapReducePtr)manager->allocate(sizeof(MapReduce));
+    w = (MapReducePtr)manager->allocate(sizeof(MapReduce));
 
     w->self = w;
     w->fmp = this;
--- a/TaskManager/ManyCore/FileMapReduce.h	Fri Jan 29 19:51:40 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.h	Sat Jan 30 17:15:21 2016 +0900
@@ -78,5 +78,6 @@
     int use_iterate;
     int task_exec_id;
     int task_print_id;
+    MapReducePtr w;
     const char *fmp_help_str;
 };