Mercurial > hg > Members > kono > Cerium

changeset 805:daab9cd6f91f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author yutaka@localhost.localdomain
date Fri, 21 May 2010 18:31:31 +0900
parents 7ac03079a2b2 (diff) 2708c4a7bade (current diff)
children 32584e896fe7
files TaskManager/kernel/ppe/TaskManager.cc TaskManager/kernel/ppe/TaskManagerImpl.cc TaskManager/kernel/ppe/TaskManagerImpl.h TaskManager/kernel/schedule/SchedTask.cc TaskManager/kernel/schedule/SchedTask.h TaskManager/kernel/schedule/Scheduler.cc TaskManager/kernel/schedule/Scheduler.h
diffstat 22 files changed, 24 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Func.h	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/Func.h	Fri May 21 18:31:31 2010 +0900
@@ -6,5 +6,7 @@
 
 enum {
 #include "RenderingGlobal.h"
+#include "global_alloc.h"
+#include "KeyID.h"
 };
 
--- a/Renderer/Engine/KeyStat.h	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/KeyStat.h	Fri May 21 18:31:31 2010 +0900
@@ -1,12 +1,6 @@
 #ifndef INCLUDED_KEY_STATUS
 #define INCLUDED_KEY_STATUS
 
-enum {
-    NONE,
-    HOLD,
-    PUSH,
-};
-
 // 可変長の構造体にする。
 // int で１つ送り bit field でやると
 struct key_stat {
--- a/Renderer/Engine/RenderingGlobal.h	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/RenderingGlobal.h	Fri May 21 18:31:31 2010 +0900
@@ -0,0 +1,6 @@
+
+/*Light 用の global_alloc ID*/
+
+  Light,
+  LightSwitch,
+  LightSysSwitch,
--- a/Renderer/Engine/SgChange.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/SgChange.cc	Fri May 21 18:31:31 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);
--- a/Renderer/Engine/global_alloc.h	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/global_alloc.h	Fri May 21 18:31:31 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
--- a/Renderer/Engine/spe/DrawSpan.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/spe/DrawSpan.cc	Fri May 21 18:31:31 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"
--- a/Renderer/Engine/spe/InitKey.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/spe/InitKey.cc	Fri May 21 18:31:31 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);
 
--- a/Renderer/Engine/spe/InitKey.h	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/spe/InitKey.h	Fri May 21 18:31:31 2010 +0900
@@ -1,7 +0,0 @@
-#ifndef INCLUDED_TASK_INIT_KEY
-#define INCLUDED_TASK_INIT_KEY
-
-#include "SchedTask.h"
-
-
-#endif
--- a/Renderer/Engine/spe/Load_Texture.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/spe/Load_Texture.cc	Fri May 21 18:31:31 2010 +0900
@@ -6,7 +6,6 @@
 #include "Load_Texture.h"
 #include "texture.h"
 #include "Func.h"
-#include "global_alloc.h"
 
 SchedDefineTask(LoadTexture);
 
--- a/Renderer/Engine/spe/UpdateKey.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/spe/UpdateKey.cc	Fri May 21 18:31:31 2010 +0900
@@ -1,7 +1,7 @@
 #include "TaskManager.h"
 #include "KeyStat.h"
 #include "UpdateKey.h"
-#include "global_alloc.h"
+#include "Func.h"
 
 SchedDefineTask(UpdateKey);
 
--- a/Renderer/Engine/task/DrawSpan.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/task/DrawSpan.cc	Fri May 21 18:31:31 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"
--- a/Renderer/Engine/task/InitKey.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/task/InitKey.cc	Fri May 21 18:31:31 2010 +0900
@@ -2,7 +2,6 @@
 #include <string.h>
 #include "InitKey.h"
 #include "Func.h"
-#include "global_alloc.h"
 #include "KeyStat.h"
 
 SchedDefineTask(InitKey);
--- a/Renderer/Engine/task/Load_Texture.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/task/Load_Texture.cc	Fri May 21 18:31:31 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);
--- a/Renderer/Engine/task/UpdateKey.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/task/UpdateKey.cc	Fri May 21 18:31:31 2010 +0900
@@ -1,7 +1,7 @@
 #include "TaskManager.h"
 #include "KeyStat.h"
 #include "UpdateKey.h"
-#include "global_alloc.h"
+#include "Func.h"
 
 SchedDefineTask(UpdateKey);
 
--- a/Renderer/Engine/viewer.cc	Fri May 21 07:47:25 2010 +0900
+++ b/Renderer/Engine/viewer.cc	Fri May 21 18:31:31 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);
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Fri May 21 18:31:31 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) {}
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Fri May 21 18:31:31 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);
--- a/TaskManager/Makefile.def	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/Makefile.def	Fri May 21 18:31:31 2010 +0900
@@ -29,8 +29,8 @@
 
 ABIBIT = 32
 
-OPT = #-O9 
-OPT =  -g
+OPT = -O9 
+#OPT =  -g
 
 CC     = g++   
 CFLAGS = -Wall `sdl-config --cflags` -m$(ABIBIT)   $(OPT)
--- a/TaskManager/kernel/ppe/TaskManager.h	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManager.h	Fri May 21 18:31:31 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;
 };
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.h	Fri May 21 18:31:31 2010 +0900
@@ -47,7 +47,6 @@
     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);
--- a/TaskManager/kernel/schedule/SchedTask.cc	Fri May 21 07:47:25 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Fri May 21 18:31:31 2010 +0900
@@ -266,6 +266,12 @@
     return manager->create_task_array(id, num_task, num_param, num_inData, num_outData) ;
 }
 
+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)
 {
--- a/example/word_count/spe/Exec.cc	Fri May 21 07:47:25 2010 +0900
+++ b/example/word_count/spe/Exec.cc	Fri May 21 18:31:31 2010 +0900
@@ -12,6 +12,7 @@
     char *i_data = (char*)s->get_input(rbuf, 0);
     unsigned long long *o_data = (unsigned long long*)s->get_output(wbuf, 0);
     int length = (int)s->get_param(0);
+    //int length = s->read_size();
     int word_flag = 1-(int)s->get_param(1); 
     //int word_flag = (int)s->get_param(1); 
     int word_num = 0;