Mercurial > hg > Game > Cerium

changeset 1451:7ab643c30a71 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix makefile
author yuuhiTOMARI
date Tue, 24 Apr 2012 19:16:44 +0900
parents 27ed99a7a48c
children e7be2c3f2c5c
files TaskManager/Gpu/GpuTaskManagerImpl.h TaskManager/Gpu/GpuThreads.h TaskManager/kernel/ppe/TaskManagerImpl.h TaskManager/kernel/schedule/Scheduler.h TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc TaskManager/test/GpuRegistTaskTest/Makefile
diffstat 6 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuTaskManagerImpl.h	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/Gpu/GpuTaskManagerImpl.h	Tue Apr 24 19:16:44 2012 +0900
@@ -20,6 +20,7 @@
     void send_taskList();
     void mail_check();
 
+    void export_task_log(){}
     void start_profile(){}
     void show_profile(){} 
     void polling(){}
--- a/TaskManager/Gpu/GpuThreads.h	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/Gpu/GpuThreads.h	Tue Apr 24 19:16:44 2012 +0900
@@ -20,8 +20,8 @@
 class GpuThreads : public Threads {
 public:
     static GpuThreads* getInstance() {
-        static GpuThreads* singleton;
-        return singleton;
+      static GpuThreads* singleton = new GpuThreads();
+      return singleton;
     }
     ~GpuThreads();
 
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.h	Tue Apr 24 19:16:44 2012 +0900
@@ -43,7 +43,7 @@
     virtual void run() = 0;
     virtual void start_profile() = 0;
     virtual void show_profile() = 0;
-    virtual void export_task_log();
+    virtual void export_task_log() = 0;
     virtual void append_activeTask(HTaskPtr);
     virtual void append_waitTask(HTaskPtr);
     virtual void polling() = 0;
--- a/TaskManager/kernel/schedule/Scheduler.h	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.h	Tue Apr 24 19:16:44 2012 +0900
@@ -86,7 +86,7 @@
 
     /* functions */
     void init(TaskManagerImpl *m, int useRefDma=0);
-    virtual void run();
+    virtual void run(){};
     void run(SchedTaskBase* task1);
 
     virtual void init_impl(int useRefDma) {};
--- a/TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc	Tue Apr 24 19:16:44 2012 +0900
@@ -86,10 +86,11 @@
 int
 main(int argc, char* argv[])
 {   
-    int task_array_num;
-    if ( ((task_array_num = atoi(argv[1])) == 0)  || argc != 1 ){
-        // 無効な引数ならデフォルトの値として5を設定
-        task_array_num = DEFAULT;
+    int task_array_num = DEFAULT;
+
+    if ( argv[1]){
+      task_array_num = atoi(argv[1]);
+      // 無効な引数ならデフォルトの値として5を設定
     }
     test(task_array_num);
     printf("regist task succeed\n");
--- a/TaskManager/test/GpuRegistTaskTest/Makefile	Tue Apr 24 18:07:27 2012 +0900
+++ b/TaskManager/test/GpuRegistTaskTest/Makefile	Tue Apr 24 19:16:44 2012 +0900
@@ -4,11 +4,11 @@
 
 TARGET=GpuRegistTaskTest
 
-$(TARGET) :
+
 
-LIBS += ../../libGpuManager.a
+LIBS += ../../libGpuManager.a -framework opencl
 
-CpuThreadsTest : GpuRegistTaskTest.o
+GpuRegistTaskTest : GpuRegistTaskTest.o
 	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
 
 clean: