# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1274541900 -32400
# Node ID f3f982bc271c04cd6be1f4403385532a25b371f0
# Parent  ff684304e1d386e1ab62a58fa05c6b42c710c91f# Parent  df36d41d5135b3855421b2c8d96ea1dd2a600589
merge

diff -r ff684304e1d3 -r f3f982bc271c Renderer/Engine/KeyID.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Renderer/Engine/KeyID.h	Sun May 23 00:25:00 2010 +0900
@@ -0,0 +1,3 @@
+    NONE,
+    HOLD,
+    PUSH,
diff -r ff684304e1d3 -r f3f982bc271c example/word_count_test/main.cc
--- a/example/word_count_test/main.cc	Sun May 23 00:23:46 2010 +0900
+++ b/example/word_count_test/main.cc	Sun May 23 00:25:00 2010 +0900
@@ -163,6 +163,7 @@
     w->self = w;
     w->task_blocks = blocks;
     w->task_spwaned = 0;
+    //w->waiting = 0;
 
     /*sizeはdivision_sizeの倍数にしている。*/
     w->size = st_mmap.size;
diff -r ff684304e1d3 -r f3f982bc271c example/word_count_test/spe/Exec.cc
--- a/example/word_count_test/spe/Exec.cc	Sun May 23 00:23:46 2010 +0900
+++ b/example/word_count_test/spe/Exec.cc	Sun May 23 00:25:00 2010 +0900
@@ -12,7 +12,8 @@
     char *i_data = (char *)rbuf;
     unsigned long long *o_data = (unsigned long long*)wbuf;
     unsigned long long *head_tail_flag = o_data +2;
-    int length = s->read_size();
+    //int length = s->read_size();
+    int length = s->get_param(0);
     int word_flag = 0;
     int word_num = 0;
     int line_num = 0;