# HG changeset patch # User Masataka Kohagura # Date 1454141721 -32400 # Node ID 1161466f4e1b358e6a4b3d3dec78e38e79004898 # Parent c62fbe66f5496a082ab659318bf39971f9987196 add FileMapReduce member variable to MapReduce w diff -r c62fbe66f549 -r 1161466f4e1b TaskManager/ManyCore/FileMapReduce.cc --- 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; diff -r c62fbe66f549 -r 1161466f4e1b TaskManager/ManyCore/FileMapReduce.h --- 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; };