Mercurial > hg > Game > Cerium
changeset 1446:ed1e38e82985 draft
merge
| author | Daichi TOMA <toma@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 23 Apr 2012 22:01:51 +0900 |
| parents | ef6933a92fff (current diff) 9de96bded518 (diff) |
| children | e8ff87511f46 |
| files | |
| diffstat | 2 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/test/GpuThreadTest/GpuThreadsTest.cc Mon Apr 23 22:01:08 2012 +0900 +++ b/TaskManager/test/GpuThreadTest/GpuThreadsTest.cc Mon Apr 23 22:01:51 2012 +0900 @@ -1,17 +1,26 @@ #include <stdio.h> #include "GpuThreads.h" -//#include "GpuScheduler.h" +#include "GpuScheduler.h" #include "CellTaskManagerImpl.h" void -main(int argc, char* argv[]) -{ - GpuThreads* c = GpuThreads::getInstance(); +tester(GpuThreads* gpuThreads){ + GpuSchedRegister(1, "twice.cl","Twice"); +} + +void +test1(){ + GpuThreads* c = GpuThreads::getInstance(); c->init(); - - gpu_register_task(1, "twice.cl","Twice"); - - delete c; + tester(c); + delete c; +} + +int +main(int argc, char* argv[]) +{ + test1(); + printf("regist task succeed\n"); } /* end */
--- a/TaskManager/test/GpuThreadTest/Makefile Mon Apr 23 22:01:08 2012 +0900 +++ b/TaskManager/test/GpuThreadTest/Makefile Mon Apr 23 22:01:51 2012 +0900 @@ -2,7 +2,7 @@ CPPFLAGS += -g -Wall -I../../../include/TaskManager -m$(ABIBIT) -TARGET= GpuScheduler GpuThreads GpuTaskManagerImpl GpuThreadsTest +TARGET= GpuThreadsTest $(TARGET) : @@ -11,11 +11,5 @@ CpuThreadsTest : GpuThreadsTest.o $(CC) $(CFLAGS) -o $@ $? $(LIBS) -CpuThreads : GpuThreads.o - $(CC) $(CFLAGS) -o $@ $? $(LIBS) - -CpuScheduler : GpuScheduler.o - $(CC) $(CFLAGS) -o $@ $? $(LIBS) - clean: rm -rf *.o $(TARGET)