# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1256274153 -32400
# Node ID 6289230fe82141c37979cc7d194e9ec0cc008b04
# Parent  2f4b5ce2a5150e3a7a79bb179a540d659d234ce7# Parent  efbb6b527fa17db43915d2ab045e407285b17509
merge

diff -r 2f4b5ce2a515 -r 6289230fe821 Renderer/Test/dynamic_create.cc
--- a/Renderer/Test/dynamic_create.cc	Fri Oct 23 00:48:25 2009 +0900
+++ b/Renderer/Test/dynamic_create.cc	Fri Oct 23 14:02:33 2009 +0900
@@ -159,17 +159,17 @@
     return object;
 }
 
-void
-del_callback(unsigned char *data, void *arg)
-{
-    free(data);
-}
+// void
+// del_callback(unsigned char *data, void *arg)
+// {
+//     free(data);
+// }
 
-void
-psx_del(int t, int id)
-{
-    psx_callback_in(t, id, del_callback, NULL);
-}
+// void
+// psx_del(int t, int id)
+// {
+//     psx_callback_in(t, id, del_callback, NULL);
+// }
 
 static void
 callback_get_xml(unsigned char *xml_tuple, void *arg) {
@@ -178,6 +178,7 @@
     unsigned char *xml_data = xml_tuple+LINDA_HEADER_SIZE;
     SceneGraphPtr sgp;
     // ここで create
+	fwrite(xml_data, 1, 10, stdout);
     sgp = create_sg(carg->manager, carg->node, xml_data, xml_len, carg->sid);
     client_list_update(carg->manager, carg->clist, carg->sid, sgp);
     free(arg);
@@ -195,9 +196,10 @@
     data = tuple+LINDA_HEADER_SIZE;
     // clientのSerialIDを取得
     serial_id = ntohl(*(int *)data);
-    
+
+	printf("serial id = %d\n", serial_id);
     // タプルを解放
-    psx_del(carg->tid, SERIAL_REGIST_TUPLE_NO);
+    //psx_del(carg->tid, SERIAL_REGIST_TUPLE_NO);
     
     // xml fileを取得する もうすでにxml fileが送信済みである事を期待
     // つまり、送信者がserial_idを送る前にxml fileを送信していなくてはならない
@@ -211,7 +213,7 @@
     //printf("get data[%d]: `%s'\n", len, data);
     free(tuple);
     
-    psx_callback_wait_rd(carg->tid, carg->read_id, callbacker, arg);
+    psx_callback_in(carg->tid, carg->read_id, callbacker, arg);
 }
 
 void
@@ -225,7 +227,7 @@
     carg->node = node;
     carg->manager = manager;
     carg->clist = clist;
-    psx_callback_wait_rd(carg->tid, carg->read_id, callbacker, carg);
+    psx_callback_in(carg->tid, carg->read_id, callbacker, carg);
 }
 
 MainLoopPtr