Mercurial > hg > Members > kono > Cerium

changeset 844:61bfd8e246fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
send_linda's bug fix, and replace wait_rd() to rd() on dynamic_load
author kazz <kazz@cr.ie.u-ryukyu.ac.jp>
date Wed, 02 Jun 2010 17:04:26 +0900
parents 0c7d885f0c92
children 1e3b67117ad9
files Renderer/Test/dynamic_create.cc Renderer/Test/send_linda.cc
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/dynamic_create.cc	Wed Jun 02 02:03:40 2010 +0900
+++ b/Renderer/Test/dynamic_create.cc	Wed Jun 02 17:04:26 2010 +0900
@@ -98,7 +98,8 @@
 	if (reply != NULL) {
 		set_position(node, reply);
 		free(reply);
-		node->seq = psx_wait_rd(sgroot->tid, node->id * 10 + 1);
+//		node->seq = psx_wait_rd(sgroot->tid, node->id * 10 + 1);
+		node->seq = psx_rd(sgroot->tid, node->id * 10 + 1);
 	}
 }
 
@@ -118,7 +119,8 @@
     sgroot->createFromXMLmemory(sgroot->tmanager, child, (char *)data, len);
     child->set_move_collision(moon_move, moon_collision);
     child->id = serial_id;
-	child->seq = psx_wait_rd(sgroot->tid, serial_id * 10 + 1);
+//	child->seq = psx_wait_rd(sgroot->tid, serial_id * 10 + 1);
+	child->seq = psx_rd(sgroot->tid, serial_id * 10 + 1);
 
     return child;
 }
--- a/Renderer/Test/send_linda.cc	Wed Jun 02 02:03:40 2010 +0900
+++ b/Renderer/Test/send_linda.cc	Wed Jun 02 17:04:26 2010 +0900
@@ -24,7 +24,7 @@
 {
 	char *data;
 	if (node->seq == 0) {
-	} else if ((data = (char *)psx_reply(node->seq)) == NULL) {
+	} else if ((data = (char *)psx_reply(node->seq)) != NULL) {
 		psx_free(data);
 	} else {
 		node->resend_flag = 1;