Mercurial > hg > Game > Cerium

changeset 2052:cc1ea3933551 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove WordCount.h
author masa
date Thu, 28 Jan 2016 17:55:47 +0900
parents b79a250b4f99
children 030b8efcf357
files TaskManager/ManyCore/FileMapReduce.h example/word_count/WordCount.h example/word_count/ppe/Print.cc
diffstat 3 files changed, 2 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/ManyCore/FileMapReduce.h	Thu Jan 28 17:23:45 2016 +0900
+++ b/TaskManager/ManyCore/FileMapReduce.h	Thu Jan 28 17:55:47 2016 +0900
@@ -23,13 +23,11 @@
     long status_num;
     long task_spawned;
     unsigned long long *o_data;
-    unsigned long long *head_tail_flag;
     long out_task_num;
     long pad;
     char *file_mmap;
     long file_size;
     HTaskPtr t_print;
-    HTaskPtr t_exec;
 } MapReduce, *MapReducePtr;
 
 // Read Type
--- a/example/word_count/WordCount.h	Thu Jan 28 17:23:45 2016 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-
-typedef struct wordCount {
-    struct wordCount *self;
-    long fd;
-    long read_filesize;
-    CPU_TYPE read_cpu;
-
-    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_blocks;      // spawn task one at a time
-    long status_num;
-    long task_spawned;
-    unsigned long long *o_data;
-    unsigned long long *head_tail_flag;
-    long out_task_num;
-    long pad;
-    char * file_mmap;
-    long file_size;
-    HTaskPtr t_print;
-    HTaskPtr t_exec;
-} WordCount, *WordCountPtr;
-
--- a/example/word_count/ppe/Print.cc	Thu Jan 28 17:23:45 2016 +0900
+++ b/example/word_count/ppe/Print.cc	Thu Jan 28 17:55:47 2016 +0900
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "Print.h"
 #include "Func.h"
-#include "WordCount.h"
+#include "FileMapReduce.h"
 
 /* これは必須 */
 SchedDefineTask1(Print,run_print);
@@ -10,7 +10,7 @@
 static int
 run_print(SchedTask *s, void *rbuf, void *wbuf)
 {
-    WordCount *w = (WordCount*)s->get_input(0);
+    MapReduce *w = (MapReduce*)s->get_input(0);
     unsigned long long *idata = w->o_data;
     // long task_num = w->task_num;
     long status_num = w->status_num;