Mercurial > hg > Game > Cerium

changeset 2059:f3e748c0e7ea draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change parameter in create_task_array
author masa
date Sat, 30 Jan 2016 19:06:17 +0900
parents ce57fa0495a7
children b70758c358dc
files TaskManager/ManyCore/FileMapReduce.cc
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.cc	Sat Jan 30 17:42:41 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.cc	Sat Jan 30 19:06:17 2016 +0900
@@ -99,6 +99,8 @@
         exit(1);
     }
 
+    MapReducePtr w = (MapReducePtr)malloc(sizeof(MapReduce));
+    this->w = w;
     return filename;
 }
 
@@ -192,7 +194,7 @@
         if (use_task_array) {
             int task_num = (w->size+size-1)/size;
             if (task_num>array_task_num) task_num = array_task_num;
-            task_array = manager->create_task_array(TASK_EXEC,task_num,1,1,1);
+            task_array = manager->create_task_array(TASK_EXEC,task_num,5,1,1);
             if (t_read != 0) task_array->wait_for(t_read);
             if (!all) { 
                 t_next->wait_for(task_array);
@@ -376,9 +378,6 @@
         return ;
     }
 
-    MapReducePtr w = (MapReducePtr)manager->allocate(sizeof(MapReduce));
-    this->w = w;
-
     w->self = w;
     w->fmp = this;
     w->fd = fd;