Mercurial > hg > Game > Cerium

changeset 2061:6d522d3ba435 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix variable in run_start
author masa
date Sun, 31 Jan 2016 16:58:20 +0900
parents b70758c358dc
children 122be26e55d6
files TaskManager/ManyCore/FileMapReduce.cc
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.cc	Sun Jan 31 15:59:57 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.cc	Sun Jan 31 16:58:20 2016 +0900
@@ -217,8 +217,8 @@
                 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);
+                t_exec->set_inData(0,w->file_mmap + task_spawned*w->division_size, size);
+                t_exec->set_outData(0,w->o_data + task_spawned*out_size, w->division_out_size);
             } else if (use_compat) {
                 h_exec = manager->create_task(TASK_EXEC);
                 t_exec->set_param(0,(long)task_spawned);
@@ -226,8 +226,8 @@
                 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);
+                h_exec->set_inData(0,w->file_mmap + task_spawned*w->division_size, size);
+                h_exec->set_outData(0,w->o_data + task_spawned*out_size, w->division_out_size);
                 t_next->wait_for(h_exec);
                 h_exec->set_cpu(spe_cpu);
                 h_exec->spawn();
@@ -246,7 +246,7 @@
                 h_exec->set_inData(1,w->o_data,w->division_out_size*w->remain_task);
                 h_exec->set_outData(0,w->file_mmap,w->file_size);
                 h_exec->set_outData(1,w->o_data,w->division_out_size*w->remain_task);
-                h_exec->set_param(0,(long)i);
+                h_exec->set_param(0,(long)task_spawned);
                 h_exec->set_param(1,(long)w->division_size);
                 h_exec->set_param(2,(long)size);
                 h_exec->set_param(3,(long)out_size);
@@ -259,8 +259,8 @@
                 break;
             } else {
                 h_exec = manager->create_task(TASK_EXEC,
-                                              (memaddr)(w->file_mmap + i*w->division_size), size,
-                                              (memaddr)(w->o_data + i*out_size), w->division_out_size);
+                          (memaddr)(w->file_mmap + task_spawned*w->division_size), size,
+                          (memaddr)(w->o_data + task_spawned*out_size), w->division_out_size);
                 t_exec->set_param(0,(long)task_spawned);
                 t_exec->set_param(1,(long)0);
                 t_exec->set_param(2,(long)size);