# HG changeset patch # User aaa # Date 1256111773 -32400 # Node ID f8d56635efb80f4b3faeacbbc02bc860f06cf143 # Parent 997d2a73a758964bd5efc2aa303d2bedf97e8b8f# Parent 6c56957ef3350d8561375ac3f5fac51f9665beb5 merge diff -r 997d2a73a758 -r f8d56635efb8 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Wed Oct 21 16:56:13 2009 +0900 @@ -0,0 +1,15 @@ +syntax: glob + +*.a +*.o +.*.swp +.*.swo +GTAGS +GRTAGS +GSYMS +GPATH + + +syntax: regexp + +^include/* diff -r 997d2a73a758 -r f8d56635efb8 TaskManager/Test/test_render/Makefile.linux --- a/TaskManager/Test/test_render/Makefile.linux Wed Oct 21 16:55:28 2009 +0900 +++ b/TaskManager/Test/test_render/Makefile.linux Wed Oct 21 16:56:13 2009 +0900 @@ -1,33 +1,35 @@ include ./Makefile.def -SRCS_TMP = $(wildcard *.cpp) -SRCS_EXCLUDE = # 輪陸 +SRCS_TMP = $(wildcard *.cc) $(wildcard Application/*.cc) +SRCS_EXCLUDE = # 文 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP)) -OBJS = $(SRCS:.cpp=.o) +OBJS = $(SRCS:.cc=.o) TASK_DIR = task -TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cpp) -TASK_SRCS_EXCLUDE = span_pack_draw.cpp +TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc) +TASK_SRCS_EXCLUDE = span_pack_draw.cc TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) -TASK_OBJS = $(TASK_SRCS:.cpp=.o) +TASK_OBJS = $(TASK_SRCS:.cc=.o) LIBS += -lFifoManager CFLAGS += `sdl-config --cflags` `xml2-config --cflags` LIBS += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs` -.SUFFIXES: .cpp .o +.SUFFIXES: .cpp .o .cc .cpp.o: $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ - -all: $(TARGET) +.cc.o: + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ -$(TARGET): SGList.o $(OBJS) $(TASK_OBJS) - $(CC) -o $@ $(OBJS) $(TASK_OBJS) SGList.o $(LIBS) +all: SGList.o $(TARGET) + +$(TARGET): $(OBJS) $(TASK_OBJS) + $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) SGList.o: create_sg_list - $(CC) $(CFLAGS) $(INCLUDE) -c SGList.cpp -o $@ + $(CC) $(CFLAGS) $(INCLUDE) -c SGList.cc -o $@ create_sg_list: @if [ ! -f SGList.h ]; then \ @@ -49,4 +51,4 @@ clean: rm -f $(TARGET) $(OBJS) $(TASK_OBJS) rm -f *~ \#* - rm -f SGList.h SGList.cpp \ No newline at end of file + rm -f SGList.h SGList.cc diff -r 997d2a73a758 -r f8d56635efb8 TaskManager/Test/test_render/lindaapi.cc --- a/TaskManager/Test/test_render/lindaapi.cc Wed Oct 21 16:55:28 2009 +0900 +++ b/TaskManager/Test/test_render/lindaapi.cc Wed Oct 21 16:56:13 2009 +0900 @@ -2,7 +2,7 @@ // /*---------------------------------------------------------------------- - 奶件弁伙□玉白央奶伙づ心慇心 + 扎喋胯怒潦∼扎怨狎輯噯 ----------------------------------------------------------------------*/ #include #include @@ -51,10 +51,10 @@ /*-------------------------------------------------------------------/ void count_packet (char type): - 由弗永玄及霜熬耨市它件玄允月 + 晞桅靽∼怒艾喋 - 婁五醒: - type - 霜耨﹜熬耨 (char滇: s,r) + 撘: + type - 靽∼靽 (char: s,r) /-------------------------------------------------------------------*/ void count_packet(char type) { @@ -95,15 +95,15 @@ /*-------------------------------------------------------------------/ int unix_read (int fd, char *buf, unsigned int size): - 扔□田井日TUPLE毛づ心仇戈﹝ - 蜇箕反銀歹木化中卅中﹝ + 萸潦TUPLE隤准踴 + 曉具臭蝙艾芥 - 婁五醒: - fd - 扔□田及白央奶伙犯奴旦弁伉皿正 - buf - 熬仃潸月犯□正及傘Ф樺赭(TUPLE目永母殖戈) - size - buf及byte醒 - 忒曰襖: - づ心仇氏分byte醒 + 撘: + fd - 萸潦柴∼扎怒嫘胯芥 + buf - 潦踴格潛湔(TUPLE怒) + size - buf宴yte + 餈: + 隤准踴byte /-------------------------------------------------------------------*/ int unix_read(int fd,char *buf,unsigned int size) { @@ -129,14 +129,14 @@ /*-------------------------------------------------------------------/ int unix_write (int fd, unsigned char *buf, unsigned int size): - 扔□田尺TUPLE毛霜月﹝ + 萸潦禁UPLE - 婁五醒: - fd - 扔□田及白央奶伙犯奴旦弁伉皿正 - buf - 扔□田尺霜月犯□正(TUPLE目永母殖戈) - size - buf及byte醒 - 忒曰襖: - 霜勻凶(踏五仇氏分)犯□正及byte醒 + 撘: + fd - 萸潦柴∼扎怒嫘胯芥 + buf - 萸潦賊潦(TUPLE怒) + size - buf宴yte + 餈: + (詻)潦踴宴yte /-------------------------------------------------------------------*/ int unix_write(int fd,unsigned char *buf,unsigned int size) { @@ -167,14 +167,14 @@ /*-------------------------------------------------------------------/ int start_linda (char * hostname): - 扔□田午及戊生弁扑亦件毛割峏仄﹜COMMAND平亙□午REPLY平亙□及 - 賡渝祭毛墊卅丹﹝ + 萸潦具柴喋胯瑯扼喋蝣箇COMMAND准乓潦沖EPLY准乓潦 + 銵芥 - 婁五醒: - hostname - 扔□田及石旦玄抩 - 忒曰襖: - 戊生弁扑亦件割峏互嶽跦允月午公及白央奶伙犯奴旦弁伉皿正毛忒允﹝ - 撩л允月午 -1 毛忒允﹝ + 撘: + hostname - 萸潦柴嫘 + 餈: + 喋胯瑯扼喟Ⅱ蝡具柴∼扎怒嫘胯芥踴餈 + 憭望 -1 餈 /-------------------------------------------------------------------*/ int start_linda(char * hostname){ @@ -255,14 +255,14 @@ /*-------------------------------------------------------------------/ int psx_out (unsigned int id, unsigned char *data, unsigned int size): - out戊穴件玉毛COMMAND平亙□尺巹戶月﹝ + out喋喋COMMAND准乓潦豢 - 婁五醒: - id - TUPLE Space及ID - data - 霜耨允月犯□正 - size - data及扔奶朮 - 忒曰襖: - 扑□弗件旦砦 + 撘: + id - TUPLE Space埋D + data - 靽∼潦 + size - data柴萸扎 + 餈: + 瑯潦晞喋寧芸 /-------------------------------------------------------------------*/ int psx_out(unsigned int id, unsigned char *data, unsigned int size){ @@ -278,17 +278,17 @@ int psx_ld (unsigned int id, char mode, void(*callback)(char*,void*), void * obj): - in,read,wait卅升及熬耨戊穴件玉毛COMMAND平亙□尺巹戶月﹝ - psx_in,psx_rd,psx_wait_rd卅升卞譆五晶尹日木化中月﹝ + in,read,wait芥押桀靽∼喋喋COMMAND准乓潦豢 + psx_in,psx_rd,psx_wait_rd芥押怎蔭艾 - 婁五醒: - id - TUPLE Space及ID - mode - i,r,w 及妐儂毛潸曰﹜備★in,read,wait毛刓仄化中月﹝ - callback - 戊□伙田永弁毛銀迕允月樺寧及楮醒尺及禾奶件正﹝ - 銀迕仄卅中樺寧反NULL毛中木月﹝ - obj - 戊□伙田永弁匹迕中月楮醒及婁五醒﹝ - 忒曰襖: - psx_queueま匹malloc今木凶REPLY厭瞻蟲尺及禾奶件正 + 撘: + id - TUPLE Space埋D + mode - i,r,w 格摮in,read,wait銵具艾 + callback - 喋潦怒胯雿輻具游桅Ｘ啜詻柴扎喋踴 + 雿輻具芥游烤ULL + obj - 喋潦怒胯抒具Ｘ啜桀啜 + 餈: + psx_queue吮allocREPLY瑽雿詻柴扎喋 /-------------------------------------------------------------------*/ int psx_ld(unsigned int id, char mode,void(*callback)(char *,void *),void * obj){ @@ -302,13 +302,13 @@ /*-------------------------------------------------------------------/ unsigned char * psx_reply (int seq): - 扔□田井日蠶尹互侳凶犯□正毛忒允﹝ + 萸潦蝑乓潦踴餈 - 婁五醒: - seq - psx_ld()互忒仄凶襖﹝ - 忒曰襖: - seq卞覆殺仄凶犯□正毛忒允﹝犯□正毛引分熬耨仄化中卅中樺寧反 - NULL毛忒允﹝ + 撘: + seq - psx_ld()餈扎 + 餈: + seq怠紋敹潦踴餈潦踴整靽∼艾芥游 + NULL餈 /-------------------------------------------------------------------*/ unsigned char * psx_reply(int seq){ @@ -356,8 +356,8 @@ /*-------------------------------------------------------------------/ void psx_sync_n (): - 扔□田午犯□正及霜熬耨毛允月﹝COMMAND平亙□卞巹引勻凶犯□正毛 - 霜耨仄﹜扔□田井日霜日木化侳凶犯□正毛覆殺允月REPLY尺中木月﹝ + 萸潦具潦踴桅靽∼COMMAND准乓潦急整潦踴 + 靽∼萸潦行乓潦踴撖曉REPLY詻 /-------------------------------------------------------------------*/ void psx_sync_n(){ @@ -392,22 +392,22 @@ int psx_queue (unsigned int id, unsigned int size, unsigned char *data, char mode, void(*callback)(char*,void*), void * obj): - out,in,read,wait卅升及戊穴件玉毛COMMAND平亙□卞巹戶月﹝犯□正毛 - 熬耨允月戊穴件玉(in,read,wait)及午五反熬仃潸勻凶午五卞犯□正毛 - 傘Ф允月REPLY厭瞻蟲毛綜月﹝ + out,in,read,wait芥押柴喋喋COMMAND准乓潦急潦踴 + 靽∼喋喋(in,read,wait)柴具臬具怒潦踴 + 潛REPLY瑽雿雿 - 婁五醒: - id - 失弁本旦允月TUPLE Space及ID - size - data及扔奶朮 - data - 霜耨允月犯□正﹝熬耨凜反NULL﹝ - mode - 戊穴件玉及乒□玉(out,in,read,wait 反備★char滇: o,i,r,w) - callback - 戊□伙田永弁毛銀迕允月樺寧及楮醒尺及禾奶件正﹝ - 銀迕仄卅中樺寧反NULL﹝ - obj - 戊□伙田永弁匹迕中月楮醒卞婁五欐允犯□正﹝ - 忒曰襖: - 嶽跦仄凶樺寧 - malloc仄凶REPLY厭瞻蟲尺及禾奶件正﹝out及樺寧反 - 0互忒月﹝ - 撩л仄凶樺寧 - FAIL(-1)互忒月﹝ + 撘: + id - Ｕ胯颯嫘TUPLE Space埋D + size - data柴萸扎 + data - 靽∼潦踴靽⊥烤ULL + mode - 喋喋柴Ｕ潦(out,in,read,wait 臬char: o,i,r,w) + callback - 喋潦怒胯雿輻具游桅Ｘ啜詻柴扎喋踴 + 雿輻具芥游烤ULL + obj - 喋潦怒胯抒具Ｘ啜怠皜∼潦踴 + 餈: + 游 - mallocREPLY瑽雿詻柴扎喋踴out桀游 + 0餈 + 憭望游 - FAIL(-1)餈 /-------------------------------------------------------------------*/ int psx_queue(unsigned int id, unsigned int size, unsigned char *data, char mode, @@ -440,7 +440,7 @@ q_end = q_end->next; } - // size 反 DATASIZE + // size DATASIZE if ((q_end->command = (unsigned char *) malloc(size+LINDA_HEADER_SIZE)) == NULL){ free(q_end); c->next = NULL; @@ -460,7 +460,7 @@ p = r_end->next; r_end = p; p->next = NULL; } p->mode = '?'; - p->seq = (int)p; // 厭瞻蟲及失玉伊旦匹摹帎 + p->seq = (int)p; // 瑽雿柴Ｕ研嫘扯 p->callback = callback; p->obj = obj; PSX_Debug(("psx_queue: seq %d reply %x p %x r_end %x",seq,reply,p,r_end)); @@ -491,10 +491,10 @@ /*-------------------------------------------------------------------/ void unix_chkserv (): - 扔□田井日犯□正(TUPLE)毛熬仃潸月﹝REPLY厭瞻蟲卞戊□伙田永弁楮醒 - 互隙爛今木化中木壬公及楮醒毛撢墊仄﹜REPLY厭瞻蟲毛平亙□井日潸曰 - 輪仁﹝戊□伙田永弁楮醒互隙爛今木化中卅仃木壬REPLY厭瞻蟲卞犯□正 - 毛婁五欐允﹝ + 萸潦潦(TUPLE)REPLY瑽雿怒喋潦怒舫Ｘ + 摰艾啜桅Ｘ啜摰銵REPLY瑽雿准乓潦 + 扎喋潦怒舫Ｘ啜摰艾芥訌EPLY瑽雿怒潦 + 撘皜∼ /-------------------------------------------------------------------*/ void unix_chkserv(){ @@ -579,16 +579,16 @@ /*-------------------------------------------------------------------/ int get_int(unsigned char * tuple, int offset): - TUPLE及目永母卞傘Ф今木凶 int滇 及犯□正毛ぜ月凶戶及楮醒 - psx_get_datalength() 午 psx_get_seq() 井日裟壬木月﹝ + TUPLE柴急潛 int 柴潦踴敺桅Ｘ + psx_get_datalength() psx_get_seq() 潦啜 - 婁五醒: - tuple - 目永母樹扷手殖氏分TUPLE﹝psx_reply()匹ぜ凶手及匹手中中﹝ - offset - 潸曰分允犯□正及左白本永玄﹝LINDA_DATA_LENGTH_OFFSET - 井 LINDA_SEQ_OFFSET﹝ + 撘: + tuple - 晞怒TUPLEpsx_reply()批柴扼 + offset - 潦踴柴芥颯LINDA_DATA_LENGTH_OFFSET + LINDA_SEQ_OFFSET - 忒曰襖: - 隙爛仄凶左白本永玄卞傘Ф今木化中凶醒襖(int滇) + 餈: + 摰芥颯急潛艾啣(int) /-------------------------------------------------------------------*/ static int get_int(unsigned char * tuple, int offset){