# HG changeset patch # User masa # Date 1454050588 -32400 # Node ID 2e7a6f40672f8e7eb85b504e90915008c1d78a8b # Parent 030b8efcf3570724fc21bbec6e9d101f277d6ad8 add param(4) in FileMapReduce.cc diff -r 030b8efcf357 -r 2e7a6f40672f TaskManager/ManyCore/FileMapReduce.cc --- 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(); diff -r 030b8efcf357 -r 2e7a6f40672f TaskManager/ManyCore/FileMapReduce.h --- 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