diff example/word_count_test/ppe/Print.cc @ 713:f725c6455d19

remove SIMPLE_TASK conditional
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 16 Dec 2009 15:27:46 +0900
parents 4af9d20cf3af
children
line wrap: on
line diff
--- a/example/word_count_test/ppe/Print.cc	Wed Dec 16 09:39:24 2009 +0900
+++ b/example/word_count_test/ppe/Print.cc	Wed Dec 16 15:27:46 2009 +0900
@@ -10,7 +10,6 @@
 static int
 run_print(SchedTask *s, void *rbuf, void *wbuf)
 {
-#ifdef SIMPLE_TASK
     WordCount *w = *(WordCount**)rbuf;
     unsigned long long *idata = w->o_data;
     // long task_num = w->task_num;
@@ -23,14 +22,6 @@
      *  o_data[1]
      *
      */
-#else
-    unsigned long long *idata = (unsigned long long*)s->get_input(rbuf, 0);
-    unsigned long long *head_tail_flag = (unsigned long long*)s->get_input(rbuf, 1);
-    // long task_num = (long)s->get_param(0);
-    long status_num = (long)s->get_param(1);
-    int out_task_num = (int)s->get_param(2);
-    int pad = (int)s->get_param(3);
-#endif
     unsigned long long word_data[2];
 
     int flag_cal_sum = 0;
@@ -75,7 +66,6 @@
 	word_data[i] = 0;
     }
 
-#ifdef SIMPLE_TASK
     for (int i = 0; i < out_task_num ; i++) {
 	word_data[0] += idata[i*w->out_size+0];
 	word_data[1] += idata[i*w->out_size+1];
@@ -86,21 +76,6 @@
 	    flag_cal_sum++;
         }
     }
-#else
-    for (int i = 1; i < out_task_num * pad - pad; i += pad) {
-      //printf("%llu ",head_tail_flag[i]);
-      //printf("%llu\n",head_tail_flag[i+1]);
-      if((head_tail_flag[i] == 1) && (head_tail_flag[i+1] == 0)) {
-	flag_cal_sum++;
-      }
-    }
-
-    for (int i = 0; i < out_task_num*status_num; i += status_num) {
-	for (int j = 0; j < status_num; j++) {
-	    word_data[j] += idata[i+j];
-	}
-    }
-#endif
 
     word_data[0] += flag_cal_sum;