# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1263259365 -32400
# Node ID 4c2e6493b008e57f096959103b4d5713784d90f6
# Parent  a969d3cdd20a49bbd938f21aabf7470cb295a445
continue..

diff -r a969d3cdd20a -r 4c2e6493b008 TaskManager/kernel/schedule/SchedTask.cc
--- a/TaskManager/kernel/schedule/SchedTask.cc	Tue Jan 12 10:18:48 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Tue Jan 12 10:22:45 2010 +0900
@@ -298,7 +298,7 @@
 {
     va_list ap;
     va_start(ap,format);
-    int ret= scheduler->vprintf(format, ap);
+    int ret= scheduler->vprintf0(format, ap);
     va_end(ap);
     return ret;
 }
diff -r a969d3cdd20a -r 4c2e6493b008 TaskManager/kernel/schedule/Scheduler.cc
--- a/TaskManager/kernel/schedule/Scheduler.cc	Tue Jan 12 10:18:48 2010 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Tue Jan 12 10:22:45 2010 +0900
@@ -440,7 +440,7 @@
 #if !defined(__SPU__)
     va_list ap;
     va_start(ap,format);
-    int ret= vprintf(format, ap);
+    int ret= vprintf0(format, ap);
     va_end(ap);
     return ret;
 #else
@@ -450,7 +450,7 @@
 
 
 int 
-Scheduler::vprintf(const char * format, va_list ap)
+Scheduler::vprintf0(const char * format, va_list ap)
 {
 #if !defined(__SPU__)
     int ret= vprintf(format, ap);
diff -r a969d3cdd20a -r 4c2e6493b008 TaskManager/kernel/schedule/Scheduler.h
--- a/TaskManager/kernel/schedule/Scheduler.h	Tue Jan 12 10:18:48 2010 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.h	Tue Jan 12 10:22:45 2010 +0900
@@ -138,7 +138,7 @@
     long get_random() ;
     Scheduler *get_scheduler() { return this; };
     int printf(const char *format, ...);
-    int vprintf(const char *format, va_list ap);
+    int vprintf0(const char *format, va_list ap);
 
 };
 
diff -r a969d3cdd20a -r 4c2e6493b008 example/word_count/main.cc
--- a/example/word_count/main.cc	Tue Jan 12 10:18:48 2010 +0900
+++ b/example/word_count/main.cc	Tue Jan 12 10:22:45 2010 +0900
@@ -124,9 +124,9 @@
     for (i = 0; i < task_num; i+=task_size) {
 	HTask *task_main = manager->create_task_array(TASK_EXEC,task_size,2,1,1);
 	int j ;
-	Task *t_exec = task_main->next_task_array(TASK_EXEC, 0);
+	Task *t_exec = 0;
 	for(j = 0; j < task_size; j++) {
-	    task_main->next_task_array(TASK_EXEC,t_exec);
+	    t_exec = task_main->next_task_array(TASK_EXEC,t_exec);
 	    task_main->set_cpu(SPE_ANY);
 	    t_print->wait_for(task_main);