# HG changeset patch
# User yutaka@localhost.localdomain
# Date 1274248781 -32400
# Node ID 496a8159e840357e6a17a66f806a73cbf50e4925
# Parent  bc050932ca8b27fdc1df81ba1a5d284f1886c624
global id

diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/Func.h
--- a/Renderer/Engine/Func.h	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/Func.h	Wed May 19 14:59:41 2010 +0900
@@ -6,5 +6,7 @@
 
 enum {
 #include "RenderingGlobal.h"
+#include "global_alloc.h"
+#include "KeyID.h"
 };
 
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/KeyStat.h
--- a/Renderer/Engine/KeyStat.h	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/KeyStat.h	Wed May 19 14:59:41 2010 +0900
@@ -1,12 +1,6 @@
 #ifndef INCLUDED_KEY_STATUS
 #define INCLUDED_KEY_STATUS
 
-enum {
-    NONE,
-    HOLD,
-    PUSH,
-};
-
 // 可変長の構造体にする。
 // int で１つ送り bit field でやると
 struct key_stat {
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/RenderingGlobal.h
--- a/Renderer/Engine/RenderingGlobal.h	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/RenderingGlobal.h	Wed May 19 14:59:41 2010 +0900
@@ -0,0 +1,6 @@
+
+/*Light 用の global_alloc ID*/
+
+  Light,
+  LightSwitch,
+  LightSysSwitch,
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/SgChange.cc
--- a/Renderer/Engine/SgChange.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/SgChange.cc	Wed May 19 14:59:41 2010 +0900
@@ -12,7 +12,6 @@
 #include "Pad.h"
 #include "Application.h"
 #include "lindaapi.h"
-#include "global_alloc.h"
 
 static void post2runLoop(SchedTask *s, void *viewer, void *s1);
 static void post2run(SchedTask *s, void *viewer, void *s1);
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/global_alloc.h
--- a/Renderer/Engine/global_alloc.h	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/global_alloc.h	Wed May 19 14:59:41 2010 +0900
@@ -1,21 +1,11 @@
-#ifndef GLOBAL_ACCLOC_H
-#define GLOBAL_ACCLOC_H
 
 /*!
   global_alloc 用の ID
 
   should be auto genarated.
  */
-enum global_allocate_id {
 
   GLOBAL_TEXTURE_HASH,
   GLOBAL_TILE_LIST,
   KEY_STATUS,
   LOAD_ID,
-  Light,
-  LightSwitch,
-  LightSysSwitch,
-
-};
-
-#endif
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/spe/DrawSpan.cc
--- a/Renderer/Engine/spe/DrawSpan.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/spe/DrawSpan.cc	Wed May 19 14:59:41 2010 +0900
@@ -6,7 +6,6 @@
 #include "viewer_types.h"
 #include "Func.h"
 #include "sys.h"
-#include "global_alloc.h"
 #include "SchedTask.h"
 #include "Tapestry.h"
 #include "SpanPack.h"
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/spe/InitKey.cc
--- a/Renderer/Engine/spe/InitKey.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/spe/InitKey.cc	Wed May 19 14:59:41 2010 +0900
@@ -2,8 +2,8 @@
 #include <string.h>
 #include "InitKey.h"
 #include "Func.h"
-#include "global_alloc.h"
 #include "KeyStat.h"
+#include "SchedTask.h"
 
 SchedDefineTask(InitKey);
 
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/spe/InitKey.h
--- a/Renderer/Engine/spe/InitKey.h	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/spe/InitKey.h	Wed May 19 14:59:41 2010 +0900
@@ -1,7 +0,0 @@
-#ifndef INCLUDED_TASK_INIT_KEY
-#define INCLUDED_TASK_INIT_KEY
-
-#include "SchedTask.h"
-
-
-#endif
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/spe/Load_Texture.cc
--- a/Renderer/Engine/spe/Load_Texture.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/spe/Load_Texture.cc	Wed May 19 14:59:41 2010 +0900
@@ -6,7 +6,6 @@
 #include "Load_Texture.h"
 #include "texture.h"
 #include "Func.h"
-#include "global_alloc.h"
 
 SchedDefineTask(LoadTexture);
 
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/spe/UpdateKey.cc
--- a/Renderer/Engine/spe/UpdateKey.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/spe/UpdateKey.cc	Wed May 19 14:59:41 2010 +0900
@@ -1,7 +1,7 @@
 #include "TaskManager.h"
 #include "KeyStat.h"
 #include "UpdateKey.h"
-#include "global_alloc.h"
+#include "Func.h"
 
 SchedDefineTask(UpdateKey);
 
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/task/DrawSpan.cc
--- a/Renderer/Engine/task/DrawSpan.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/task/DrawSpan.cc	Wed May 19 14:59:41 2010 +0900
@@ -6,7 +6,6 @@
 #include "viewer_types.h"
 #include "Func.h"
 #include "sys.h"
-#include "global_alloc.h"
 #include "SchedTask.h"
 #include "Tapestry.h"
 #include "SpanPack.h"
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/task/InitKey.cc
--- a/Renderer/Engine/task/InitKey.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/task/InitKey.cc	Wed May 19 14:59:41 2010 +0900
@@ -2,7 +2,6 @@
 #include <string.h>
 #include "InitKey.h"
 #include "Func.h"
-#include "global_alloc.h"
 #include "KeyStat.h"
 
 SchedDefineTask(InitKey);
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/task/Load_Texture.cc
--- a/Renderer/Engine/task/Load_Texture.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/task/Load_Texture.cc	Wed May 19 14:59:41 2010 +0900
@@ -3,7 +3,6 @@
 #include "Load_Texture.h"
 #include "texture.h"
 #include "Func.h"
-#include "global_alloc.h"
 #include "Tapestry.h"
 
 SchedDefineTask(LoadTexture);
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/task/UpdateKey.cc
--- a/Renderer/Engine/task/UpdateKey.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/task/UpdateKey.cc	Wed May 19 14:59:41 2010 +0900
@@ -1,7 +1,7 @@
 #include "TaskManager.h"
 #include "KeyStat.h"
 #include "UpdateKey.h"
-#include "global_alloc.h"
+#include "Func.h"
 
 SchedDefineTask(UpdateKey);
 
diff -r bc050932ca8b -r 496a8159e840 Renderer/Engine/viewer.cc
--- a/Renderer/Engine/viewer.cc	Wed May 05 16:33:41 2010 +0900
+++ b/Renderer/Engine/viewer.cc	Wed May 19 14:59:41 2010 +0900
@@ -12,7 +12,6 @@
 #include "Pad.h"
 #include "Application.h"
 #include "lindaapi.h"
-#include "global_alloc.h"
 
 static void post2runLoop(SchedTask *s,void *viewer,void *s1);
 static void post2runDraw(SchedTask *s,void *viewer,void *s1);
diff -r bc050932ca8b -r 496a8159e840 TaskManager/Cell/spe/SpeTaskManagerImpl.cc
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Wed May 19 14:59:41 2010 +0900
@@ -26,6 +26,7 @@
 
 HTaskPtr TaskManagerImpl::create_task(int cmd) {return 0;}
 HTaskPtr TaskManagerImpl::create_task(int cmd, memaddr rbuf, long rs, memaddr wbuf, long ws) { return 0; }
+HTask * TaskManagerImpl::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData) {return 0;}
 void TaskManagerImpl::set_task_depend(HTaskPtr master, HTaskPtr slave) {}
 void TaskManagerImpl::spawn_task(HTaskPtr) {}
 void TaskManagerImpl::set_task_cpu(HTaskPtr, CPU_TYPE) {}
diff -r bc050932ca8b -r 496a8159e840 TaskManager/Cell/spe/SpeTaskManagerImpl.h
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Wed May 19 14:59:41 2010 +0900
@@ -21,6 +21,7 @@
     void show_profile();
     HTaskPtr create_task(int cmd);
     HTaskPtr create_task(int cmd, memaddr rbuf, long r_size, memaddr wbuf, long w_size);
+    HTaskPtr create_task_array(int cmd, memaddr rbuf, long rs, memaddr wbuf, long ws);
     void set_task_depend(HTaskPtr master, HTaskPtr slave);
     void spawn_task(HTaskPtr);
     void set_task_cpu(HTaskPtr, CPU_TYPE);
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/ppe/TaskManager.cc
--- a/TaskManager/kernel/ppe/TaskManager.cc	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManager.cc	Wed May 19 14:59:41 2010 +0900
@@ -64,9 +64,12 @@
 
 HTaskPtr 
 TaskManager::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData) {
-    HTaskPtr ta = create_task(TaskArray,0,0,0,0);
-    ta->create_task_array(id, num_task, num_param, num_inData, num_outData) ;
-    return ta;
+
+  return m_impl->create_task_array(id, num_task, num_param, num_inData, num_outData);
+
+  //HTaskPtr ta = create_task(TaskArray,0,0,0,0);
+  //ta->create_task_array(id, num_task, num_param, num_inData, num_outData) ;
+  //return ta;
 }
 
 /**
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/ppe/TaskManager.h
--- a/TaskManager/kernel/ppe/TaskManager.h	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManager.h	Wed May 19 14:59:41 2010 +0900
@@ -21,6 +21,8 @@
     /* user function */
     HTaskPtr create_task(int cmd);
     HTaskPtr create_task(int cmd, memaddr r, long rs, memaddr w, long ws);
+    HTaskPtr create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData);
+
     void run();
     void *allocate(int size);
     void set_TMend(void (*endf)(TaskManager *manager));
@@ -36,9 +38,6 @@
     void init();
     void finish();
 
-    HTask *create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData);
-
-
 private:
     int machineNum;
 };
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/ppe/TaskManagerImpl.cc
--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc	Wed May 19 14:59:41 2010 +0900
@@ -70,6 +70,13 @@
     return new_task;
 }
 
+HTaskPtr 
+TaskManagerImpl::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData) {
+    HTaskPtr ta = create_task(TaskArray,0,0,0,0);
+    ta->create_task_array(id, num_task, num_param, num_inData, num_outData) ;
+    return ta;
+}
+
 /**
  * task の依存関係を設定
  * master task が終わってから、slave task を実行するように
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/ppe/TaskManagerImpl.h
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.h	Wed May 19 14:59:41 2010 +0900
@@ -47,6 +47,7 @@
     // user
     virtual HTaskPtr create_task(int cmd);
     virtual HTaskPtr create_task(int cmd, memaddr rbuf, long r_size, memaddr wbuf, long w_size);
+    virtual HTaskPtr create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData);
     virtual void set_task_depend(HTaskPtr master, HTaskPtr slave);
     virtual void spawn_task(HTaskPtr);
     virtual void set_task_cpu(HTaskPtr, CPU_TYPE);
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/schedule/SchedTask.cc
--- a/TaskManager/kernel/schedule/SchedTask.cc	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Wed May 19 14:59:41 2010 +0900
@@ -260,6 +260,12 @@
     return scheduler->create_task(cmd,r,rs,w,ws);
 }
 
+HTaskPtr
+SchedTask::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData)
+{
+  return scheduler->create_task_array(id, num_task, num_param, num_inData, num_outData);
+}
+
 
 void SchedTask::set_task_depend(HTaskPtr master, HTaskPtr slave)
 {
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/schedule/SchedTask.h
--- a/TaskManager/kernel/schedule/SchedTask.h	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.h	Wed May 19 14:59:41 2010 +0900
@@ -116,6 +116,7 @@
     // user
     HTaskPtr create_task(int cmd);
     HTaskPtr create_task(int cmd, memaddr r, long rs, memaddr w, long ws);
+    HTask * create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData);
 
     void set_task_depend(HTaskPtr master, HTaskPtr slave);
     void spawn_task(HTaskPtr);
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/schedule/Scheduler.cc
--- a/TaskManager/kernel/schedule/Scheduler.cc	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Wed May 19 14:59:41 2010 +0900
@@ -420,6 +420,12 @@
     return manager->create_task(cmd,r,rs,w,ws);
 }
 
+
+HTaskPtr 
+Scheduler::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData) {
+     return manager->create_task_array(id,num_task,num_param,num_inData,num_outData);
+}
+
 void Scheduler::set_task_depend(HTask * master, HTask * slave) { 
     manager->set_task_depend(master, slave) ;
 }
diff -r bc050932ca8b -r 496a8159e840 TaskManager/kernel/schedule/Scheduler.h
--- a/TaskManager/kernel/schedule/Scheduler.h	Wed May 05 16:33:41 2010 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.h	Wed May 19 14:59:41 2010 +0900
@@ -129,6 +129,7 @@
     // user
     HTask * create_task(int cmd);
     HTask * create_task(int cmd, memaddr r, long rs, memaddr w, long ws);
+    HTask * create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData);
 
     void set_task_depend(HTask * master, HTask * slave) ;
     void spawn_task(HTask * t) ;