Members/kono/Cerium: Renderer/Engine/lindaapi.cc comparison

comparison Renderer/Engine/lindaapi.cc @ 606:32a7260fad2f

32bit/64bit ABI (64 bit is not tested yet). 64bit ABI requires 64bit SDL library etc.

author	Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date	Sat, 07 Nov 2009 18:05:52 +0900
parents	90c61fe2b109
children	0decff4e867b

comparison

equal deleted inserted replaced

-:90c61fe2b109
+:32a7260fad2f
 #include <sys/un.h>
 #include <errno.h>
 #include <arpa/inet.h>
 #include "lindaapi.h"
-#if 0
 #if 0
 #define PSX_Debug(deb)    (putchar(PS_DEB)),\
 (printf deb ),\
 (putchar(PS_DEB))
 static int g_max_fds = 0;  /* 監視するFDの最大値 */
 /* Static Functions */
 static void unix_chkserv(int ps);
 void psx_free(void *);
-static int psx_queue(unsigned int tspace_id, unsigned int id,
+static long psx_queue(unsigned int tspace_id, unsigned int id,
 unsigned int size, unsigned char *data, char mode,
 void(*callback)(unsigned char *,void *),void * obj);
 #ifdef COUNT_PACKET
 // print packet count message per PRINT_INTERVAL sec
 data      - 送信するデータ
 size      - dataのサイズ
 返り値:
 シーケンス番号
 /-------------------------------------------------------------------*/
-int
+long
 psx_out(unsigned int tspace_id, unsigned int id,
 unsigned char *data, unsigned int size){
-int r;
+long r;
 if ((r = psx_queue(tspace_id, id, size, data, 'o', NULL, NULL)) == FAIL) {
 return(FAIL);
 }
 DEB( fprintf(stdout, "psx_out: size = %d, command = %s\n",
 q_end->size, q_end->command+LINDA_HEADER_SIZE));
 使用しない場合はNULLをいれる。
 obj      - コールバックで用いる関数の引き数。
 返り値:
 psx_queue内でmallocされたREPLY構造体へのポインタ
 /-------------------------------------------------------------------*/
-int
+long
 psx_ld(unsigned int tspace_id, unsigned int id,
 char mode, void(*callback)(unsigned char *,void *), void * obj){
-int r;
+long r;
 if ((r = psx_queue(tspace_id, id, 0, NULL, mode, callback, obj)) == FAIL) {
 return(FAIL);
 }
 return(r);
 }
 REPLY *p, *q;
 unsigned char *ans;
 DEB(fprintf(stdout, "psx_reply: search of seq = %d\n", seq));
 PSX_Debug(("psx_reply: seq %d", seq));
-// linear search なの?
 for(q = NULL,p = reply; p; q = p,p = p->next){
 if (p->seq == seq){
 DEB(fprintf(stdout, "psx_reply: match of seq = %d\n", seq));
 if (p->mode == '!'){
 ans = p->answer;
 }
 }
 }
 /*-------------------------------------------------------------------/
-static long
+static int
 psx_queue (unsigned int tspace_id, 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)のときは受け取ったときにデータを
 返り値:
 成功した場合 - mallocしたREPLY構造体へのポインタ。outの場合は
 0が返る。
 失敗した場合 - FAIL(-1)が返る。
 /-------------------------------------------------------------------*/
-static int
+static long
 psx_queue(unsigned int tspace_id, unsigned int id,
 unsigned int size, unsigned char *data, char mode,
 void(*callback)(unsigned char *,void *), void * obj){
 REPLY *p;
 COMMAND *c;
 }
 /* データ受け取り要求(in,rd,wait)なら受け取り用の箱を用意 */
 if (mode != 'o') {
 if (reply == NULL){
-reply = new_reply();
+if ((reply = (REPLY *) malloc (sizeof(REPLY))) == NULL){
+return(FAIL);
+}
 p = r_end = reply; p->next = NULL;
 } else {
-r_end->next = new_reply();
+if ((r_end->next = (REPLY *) malloc (sizeof(REPLY))) == NULL){
+return(FAIL);
+}
 p = r_end->next; r_end = p; p->next = NULL;
 }
 p->mode = '?';
-p->seq = p->reply_id;
+p->seq = (long)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));
 } else {
 p = 0;
 q_end->command[LINDA_SEQ_OFFSET]   = ((long)p>>24) & 0xff;
 q_end->command[LINDA_SEQ_OFFSET+1] = ((long)p>>16) & 0xff;
 q_end->command[LINDA_SEQ_OFFSET+2] = ((long)p>>8)  & 0xff;
 q_end->command[LINDA_SEQ_OFFSET+3] = ((long)p)     & 0xff;
+q_end->command[LINDA_DATA_LENGTH_OFFSET]   = (size>>24) & 0xff;
+q_end->command[LINDA_DATA_LENGTH_OFFSET+1] = (size>>16) & 0xff;
+q_end->command[LINDA_DATA_LENGTH_OFFSET+2] = (size>>8)  & 0xff;
+q_end->command[LINDA_DATA_LENGTH_OFFSET+3] = (size)     & 0xff;
 q_end->size = size+LINDA_HEADER_SIZE;       /* command size */
 q_end->tspace_id = tspace_id;  /* destination id */
 q_end->next = NULL;
 qsize++;
 tuple[LINDA_MODE_OFFSET] = mode;
 }
-static ReplyPtr freeReply;   /* Free Pool of Reply */
-static ReplyPtr replyPool;   /* List of malloced free Reply */
-static ReplyPtr extend_reply_pool(int num);
-static const int QUEUE_MALLOC_ERROR =   10;
-static const int POOL_SIZE_OVER_ERROR = 11;
-static int reply_errno;
-//
-// Initialize Reply Pool
-//    return NULL on error
-//
-static ReplyPtr
-init_reply(int num)
-{
-ReplyPtr q;
-if (! replyPool) {
-	return extend_reply_pool(num);
-}
-return replyPool;
-}
-static ReplyPtr
-extend_reply_pool(int num)
-{
-ReplyPtr q;
-// Keep malloc history in ReplyPool
-q =  (ReplyPtr) malloc(sizeof(Reply) * (num+1));
-if (!q) {
-	reply_errno = QUEUE_MALLOC_ERROR;
-	retrun q;
-}
-q->next = replyPool;
-replyPool = q;
-// Connect all free reply in the pool
-q = queeuePool + 1;
-for(q = replyPool+1; num-->0;  q++) q->next = q+1;
-q->next = freeReply;
-freeReply = replyPool+1;
-return replyPool;
-}
-static void
-destory_reply()
-{
-ReplyPtr q;
-for(q = replyPool ;q; q = q->next) {
-	free(q);
-}
-freeReply = replyPool = NULL;
-}
-static ReplyPtr
-new_reply(int priority, int task)
-{
-ReplyPtr q;
-if (!freeReply) {
-	pool_size *= 2;
-	if (pool_size > MAX_POOL_SIZE) {
-	    reply_errno = POOL_SIZE_OVER_ERROR;
-	    return NULL;
-	}
-	if (!extend_reply_pool(pool_size)) {
-	    return NULL;
-	}
-}
-q = freeReply;
-freeReply = freeReply->next;
-q->next = NULL;
-q->priority = priority;
-q->task = task;
-return q;
-}
-static void
-free_reply(ReplyPtr q)
-{
-q->next = freeReply;
-freeReply = q;
-}
-static TaskListPtr
-new_task_list(char *name)
-{
-TaskLilstPtr task;
-task =  (TaskListPtr) malloc(sizeof(TaskList));
-task->reply = NULL;
-task->name = name;
-}
-static void
-free_task_list(TaskListPtr task)
-{
-free(task);
-}
-static void
-insert_reply(TaskListPtr list,ReplyPtr q)
-{
-q->next = list->reply;
-list->reply = q;
-}
-static void
-qppend_reply(TaskListPtr list,ReplyPtr q)
-{
-ReplyPtr p = list->reply;
-while(p->next) p = p->next;
-p->next = q;
-}
-static void
-remove_reply(TaskListPtr list,ReplyPtr q)
-{
-ReplyPtr p = list->reply;
-ReplyPtr p1 = p->next;
-while(p1 && p1 != q) { p1 = p1->next; p = p->next; }
-if (p1) {
-	p->next = p1->next;
-}
-}
-#else
-void
-psx_sync_n(){
-}
-#endif
 /* end */

Mercurial > hg > Members > kono > Cerium

comparison Renderer/Engine/lindaapi.cc @ 606:32a7260fad2f