Mercurial > hg > Game > Cerium

changeset 1350:f8cabb739697 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Daichi TOMA <toma@cr.ie.u-ryukyu.ac.jp>
date Tue, 17 Jan 2012 17:39:07 +0900
parents a6373ea9a669 (current diff) b4bb06cfaa72 (diff)
children df50c95267ba dd3b8f54e3e3
files TaskManager/Cell/spe/ShowTime.cc TaskManager/Cell/spe/ShowTime.h TaskManager/Cell/spe/StartProfile.cc TaskManager/Cell/spe/StartProfile.h
diffstat 7 files changed, 44 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Cell/spe/ShowTime.cc	Tue Jan 17 16:44:10 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#include "ShowTime.h"
-//#include "stdio.h"
-#include "SchedTask.h"
-
-SchedDefineTask(ShowTime);
-
-static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
-{
-    /*
-     * ここで show_dma_wait() を呼びたい
-     */
-    // printf("Show Time !\n");
-    smanager->show_dma_wait();
-
-    return 0;
-}
-
--- a/TaskManager/Cell/spe/ShowTime.h	Tue Jan 17 16:44:10 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef INCLUDED_TASK_SHOW_TIME
-#define INCLUDED_TASK_SHOW_TIME
-
-#include "SchedTask.h"
-
-
-#endif
--- a/TaskManager/Cell/spe/StartProfile.cc	Tue Jan 17 16:44:10 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#include "StartProfile.h"
-#include "SchedTask.h"
-//#include "stdio.h"
-
-SchedDefineTask(StartProfile);
-
-static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
-{
-    smanager->start_profile();
-
-    return 0;
-}
-
--- a/TaskManager/Makefile.cell	Tue Jan 17 16:44:10 2012 +0900
+++ b/TaskManager/Makefile.cell	Tue Jan 17 17:39:07 2012 +0900
@@ -27,17 +27,19 @@
     $(CELL_SPE_DIR)/CellDmaManager.cc   \
     $(CELL_SPE_DIR)/CellScheduler.cc    \
     $(CELL_SPE_DIR)/SpeTaskManagerImpl.cc    \
-    $(CELL_SPE_DIR)/ShowTime.cc    \
-    $(CELL_SPE_DIR)/StartProfile.cc    \
     $(CELL_SPE_DIR)/main.cc
 
 CELL_SPE_TASK_SRCS =  \
     $(CELL_SPE_DIR)/TaskQueue.cc \
     $(CELL_SPE_DIR)/Task.cc           
 
+CELL_SPE_PROFILE = \
+	$(KERN_SYSTASK_DIR)/ShowTime.cc  \
+	$(KERN_SYSTASK_DIR)/StartProfile.cc 
+
 # $(wildcard $(CELL_SPE_DIR)/*.cc)
 
-CELL_SPE_OBJS = $(CELL_SPE_SRCS:.cc=.o) $(CELL_SPE_SCHEDULE_OBJ) $(CELL_SPE_TASK_SRCS:.cc=.o)
+CELL_SPE_OBJS = $(CELL_SPE_SRCS:.cc=.o) $(CELL_SPE_SCHEDULE_OBJ) $(CELL_SPE_TASK_SRCS:.cc=.o) $(CELL_SPE_PROFILE:.cc=.o)
 
 SPUCC = spu-g++ -DABIBIT=$(ABIBIT)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/kernel/sys_task/ShowTime.cc	Tue Jan 17 17:39:07 2012 +0900
@@ -0,0 +1,18 @@
+#include "ShowTime.h"
+//#include "stdio.h"
+#include "SchedTask.h"
+
+SchedDefineTask(ShowTime);
+
+static int
+run(SchedTask *smanager, void *rbuf, void *wbuf)
+{
+    /*
+     * ここで show_dma_wait() を呼びたい
+     */
+    // printf("Show Time !\n");
+    smanager->show_dma_wait();
+
+    return 0;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/kernel/sys_task/ShowTime.h	Tue Jan 17 17:39:07 2012 +0900
@@ -0,0 +1,7 @@
+#ifndef INCLUDED_TASK_SHOW_TIME
+#define INCLUDED_TASK_SHOW_TIME
+
+#include "SchedTask.h"
+
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/kernel/sys_task/StartProfile.cc	Tue Jan 17 17:39:07 2012 +0900
@@ -0,0 +1,14 @@
+#include "StartProfile.h"
+#include "SchedTask.h"
+//#include "stdio.h"
+
+SchedDefineTask(StartProfile);
+
+static int
+run(SchedTask *smanager, void *rbuf, void *wbuf)
+{
+    smanager->start_profile();
+
+    return 0;
+}
+