diff TaskManager/ManyCore/FileMapReduce.h @ 2053:030b8efcf357 draft

remove wordCount dependency in FileMapReduce
author masa
date Thu, 28 Jan 2016 18:52:38 +0900 (2016-01-28)
parents cc1ea3933551
children 2e7a6f40672f
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.h	Thu Jan 28 17:55:47 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.h	Thu Jan 28 18:52:38 2016 +0900
@@ -16,14 +16,11 @@
     long size;             // remaining file size
     long division_size;    // for each word count task
     long division_out_size;
-    long out_size;
-    long out_size_;
-    long task_num;         // remaining task count
+    long task_num;         // task count
+    long remain_task;      // remaining task count
     long task_blocks;      // spawn task one at a time
-    long status_num;
     long task_spawned;
     unsigned long long *o_data;
-    long out_task_num;
     long pad;
     char *file_mmap;
     long file_size;
@@ -77,10 +74,11 @@
     int TASK_EXEC;
     int TASK_EXEC_DATA_PARALLEL;
     int TASK_PRINT;
+public:
+    CPU_TYPE read_spe_cpu;
     int blocks;
     int division; // in Kbyte
-public:
-    CPU_TYPE read_spe_cpu;
+    int division_out_size;
     int use_iterate;
     int task_exec_id;
     int task_print_id;