Mercurial > hg > Game > Cerium

changeset 1485:cdf5d5d60b71 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 06 Aug 2012 20:17:30 +0900
parents fc1d9f87853b
children 756aa0f08814
files TaskManager/Gpu/GpuScheduler.cc TaskManager/Gpu/GpuScheduler.h TaskManager/test/GpuRunTest/GpuRunTest.cc TaskManager/test/GpuRunTest/task_init.cc
diffstat 4 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuScheduler.cc	Mon Aug 06 20:01:59 2012 +0900
+++ b/TaskManager/Gpu/GpuScheduler.cc	Mon Aug 06 20:17:30 2012 +0900
@@ -101,7 +101,7 @@
 }
 
 void
-GpuScheduler::gpu_register_task(int cmd, const char* filename, const char* functionname)
+gpu_register_task(int cmd, const char* filename, const char* functionname)
 {
     int fp;
     char *source_str;
--- a/TaskManager/Gpu/GpuScheduler.h	Mon Aug 06 20:01:59 2012 +0900
+++ b/TaskManager/Gpu/GpuScheduler.h	Mon Aug 06 20:17:30 2012 +0900
@@ -19,7 +19,6 @@
     void init_impl(int useRefDma);
     void init_gpu();
     void run();
-    void gpu_register_task(int cmd,const char* filename,const char* functionname);
     
     void mail_write_from_host(memaddr data) {
         fifoDmaManager->mail_write_from_host(data);
@@ -45,6 +44,8 @@
 
 };
 
+extern void gpu_register_task(int cmd,const char* filename,const char* functionname);
+
 #endif
 
 #define GpuSchedRegister(str, filename, functionname)   \
--- a/TaskManager/test/GpuRunTest/GpuRunTest.cc	Mon Aug 06 20:01:59 2012 +0900
+++ b/TaskManager/test/GpuRunTest/GpuRunTest.cc	Mon Aug 06 20:17:30 2012 +0900
@@ -39,7 +39,7 @@
 
 
 void
-test(TaskManager *manager, long int length, GpuScheduler *gpu) {
+test(TaskManager *manager, long int length) {
     
     int *indata  = new int[length];
     int *outdata = new int[length];
@@ -50,7 +50,7 @@
 
     print_data(indata, count, "before");
     
-    HTaskPtr schedtask = manager->create_task(SchedRun);
+    HTaskPtr schedtask = manager->create_task(Twice);
 
     schedtask->set_param(0, length);
     schedtask->set_inData(0, indata, sizeof (int)*length);
@@ -73,7 +73,7 @@
     
     task_init();
 
-    test(manager, length, gpu);
+    test(manager, length);
     
     return 0;
 }
--- a/TaskManager/test/GpuRunTest/task_init.cc	Mon Aug 06 20:01:59 2012 +0900
+++ b/TaskManager/test/GpuRunTest/task_init.cc	Mon Aug 06 20:17:30 2012 +0900
@@ -1,11 +1,9 @@
 #include "GpuFunc.h"
 #include "GpuScheduler.h"
 
-extern void gpu_register_task(int, const char*, const char*);
-
 void
 task_init(void)
 {
-    int cmd = SchedRun;
+    int cmd = Twice;
     GpuSchedRegister(cmd, "twice.cl", "twice");
 }