Mercurial > hg > Members > kono > Cerium

changeset 258:a09588a03ea5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change example/dependency_task
author aaa
date Wed, 03 Jun 2009 19:41:39 +0900
parents e0e20d7227cc
children 08820e4f8812
files example/dependency_task/Makefile example/dependency_task/Makefile.cell example/dependency_task/Makefile.def example/dependency_task/Makefile.ps3 example/dependency_task/main.cc example/dependency_task/spe/Makefile
diffstat 6 files changed, 47 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/example/dependency_task/Makefile	Wed Jun 03 18:50:15 2009 +0900
+++ b/example/dependency_task/Makefile	Wed Jun 03 19:41:39 2009 +0900
@@ -8,8 +8,8 @@
 	@echo "Make for Linux"
 	@$(MAKE) -f Makefile.linux
 
-ps3: FORCE
-	@echo "Make for PS3 (Cell)"
+cell: FORCE
+	@echo "Make for CELL (Cell)"
 	@$(MAKE) -f Makefile.cell
 
 FORCE:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/dependency_task/Makefile.cell	Wed Jun 03 19:41:39 2009 +0900
@@ -0,0 +1,39 @@
+include ./Makefile.def
+
+SRCS_TMP = $(wildcard *.cc)
+SRCS_EXCLUDE =  # 除外するファイルを書く
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cc=.o)
+
+TASK_DIR  = ppe
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+TASK_SRCS_EXCLUDE = 
+TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
+TASK_OBJS = $(TASK_SRCS:.cc=.o)
+
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
+
+.SUFFIXES: .cc .o
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: $(TARGET) speobject
+
+$(TARGET): $(OBJS) $(TASK_OBJS)
+	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
+
+speobject:
+	cd spe; $(MAKE)
+
+link:
+	$(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
+
+debug: $(TARGET)
+	sudo ppu-gdb ./$(TARGET) 
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
+	rm -f *~ \#*
+	rm -f ppe/*~ ppe/\#*
+	cd spe; $(MAKE) clean
--- a/example/dependency_task/Makefile.def	Wed Jun 03 18:50:15 2009 +0900
+++ b/example/dependency_task/Makefile.def	Wed Jun 03 19:41:39 2009 +0900
@@ -5,7 +5,7 @@
 #CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-CERIUM = ../../Cerium
+CERIUM = ../../../Cerium
 
 CC      = g++
 CFLAGS  = -g -Wall -O9
--- a/example/dependency_task/Makefile.ps3	Wed Jun 03 18:50:15 2009 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-include ./Makefile.def
-
-SRCS_TMP = $(wildcard *.cc)
-SRCS_EXCLUDE =  # 除外するファイルを書く
-SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
-OBJS = $(SRCS:.cc=.o)
-
-TASK_DIR  = ppe
-TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
-TASK_SRCS_EXCLUDE = 
-TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
-TASK_OBJS = $(TASK_SRCS:.cc=.o)
-
-LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
-
-.SUFFIXES: .cc .o
-
-.cc.o:
-	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
-
-all: $(TARGET) speobject
-
-$(TARGET): $(OBJS) $(TASK_OBJS)
-	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
-
-speobject:
-	cd spe; $(MAKE)
-
-link:
-	$(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
-
-debug: $(TARGET)
-	sudo ppu-gdb ./$(TARGET) 
-
-clean:
-	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
-	rm -f *~ \#*
-	rm -f ppe/*~ ppe/\#*
-	cd spe; $(MAKE) clean
--- a/example/dependency_task/main.cc	Wed Jun 03 18:50:15 2009 +0900
+++ b/example/dependency_task/main.cc	Wed Jun 03 19:41:39 2009 +0900
@@ -10,7 +10,7 @@
 int length = DATA_NUM;
 int depend_flg = 1;
 
-char *help_str = "Usage: ./dependency [-cpu spe_num] [-nodepend]\n\
+const char *usr_help_str = "Usage: ./dependency [-cpu spe_num] [-nodepend]\n\
   -nodepend  No Depenendcy";
 
 void
@@ -19,7 +19,7 @@
     HTaskPtr t_exec;
     HTaskPtr t_print;
 
-    idata = (int*)manager->malloc(sizeof(int)*length*2);
+    idata = (int*)manager->allocate(sizeof(int)*length*2);
     for (int i = 0; i < length*2; i++) {
 	idata[i] = 0;
     }
@@ -55,17 +55,13 @@
 	if (strcmp(argv[i], "-nodepend") == 0) {
 	    depend_flg = 0;
 	}
-	if (strcmp(argv[i], "--help") == 0) {
-            printf("%s\n", help_str);
-            return -1;
-	}
     }
 
     return 0;
 }
 
 int
-cerium_main(int argc, char *argv[])
+TMmain(int argc, char *argv[])
 {
     if (init(argc, argv) < 0) {
 	return -1;
--- a/example/dependency_task/spe/Makefile	Wed Jun 03 18:50:15 2009 +0900
+++ b/example/dependency_task/spe/Makefile	Wed Jun 03 19:41:39 2009 +0900
@@ -8,8 +8,8 @@
 
 CC      = spu-g++
 CFLAGS  = -g -Wall -fno-exceptions -fno-rtti #-DDEBUG
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lspemanager
+INCLUDE = -I../${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L../${CERIUM}/TaskManager -lspemanager
 
 .SUFFIXES: .cc .o