Mercurial > hg > Game > Cerium

changeset 2054:2e7a6f40672f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add param(4) in FileMapReduce.cc
author masa
date Fri, 29 Jan 2016 15:56:28 +0900
parents 030b8efcf357
children c62fbe66f549
files TaskManager/ManyCore/FileMapReduce.cc TaskManager/ManyCore/FileMapReduce.h
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.cc	Thu Jan 28 18:52:38 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.cc	Fri Jan 29 15:56:28 2016 +0900
@@ -208,6 +208,7 @@
                 t_exec->set_param(1,(long)0);
                 t_exec->set_param(2,(long)size);
                 t_exec->set_param(3,(long)w->division_out_size);
+                t_exec->set_param(4,(long)w);
                 t_exec->set_inData(0,w->file_mmap + i*w->division_size, size);
                 t_exec->set_outData(0,w->o_data + i*out_size, w->division_out_size);
             } else if (use_compat) {
@@ -216,6 +217,7 @@
                 t_exec->set_param(1,(long)0);
                 t_exec->set_param(2,(long)size);
                 t_exec->set_param(3,(long)w->division_out_size);
+                t_exec->set_param(4,(long)w);
                 h_exec->set_inData(0,w->file_mmap + i*w->division_size, size);
                 h_exec->set_outData(0,w->o_data + i*out_size, w->division_out_size);
                 t_next->wait_for(h_exec);
@@ -240,6 +242,7 @@
                 h_exec->set_param(1,(long)w->division_size);
                 h_exec->set_param(2,(long)size);
                 h_exec->set_param(3,(long)out_size);
+                h_exec->set_param(4,(long)w);
                 t_next->wait_for(h_exec);
                 h_exec->set_cpu(spe_cpu);
                 h_exec->iterate(array_task_num);
@@ -254,6 +257,7 @@
                 t_exec->set_param(1,(long)0);
                 t_exec->set_param(2,(long)size);
                 t_exec->set_param(3,(long)w->division_out_size);
+                t_exec->set_param(4,(long)w);
                 t_next->wait_for(h_exec);
                 h_exec->set_cpu(spe_cpu);
                 h_exec->spawn();
--- a/TaskManager/ManyCore/FileMapReduce.h	Thu Jan 28 18:52:38 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.h	Fri Jan 29 15:56:28 2016 +0900
@@ -25,6 +25,7 @@
     char *file_mmap;
     long file_size;
     HTaskPtr t_print;
+    void* global;          // generale user data
 } MapReduce, *MapReducePtr;
 
 // Read Type