Mercurial > hg > FederatedLinda

changeset 86:c0591636a71a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(no commit message)
author one
date Tue, 09 Feb 2010 06:14:52 +0900
parents d0d8aeaebccf
children 8931a3e90c2a
files src/fdl/FederatedLinda.java src/fdl/MetaLinda.java src/fdl/test/debug/ConfigurationManagerEngine.java src/fdl/test/debug/MetaProtocolEngine.java
diffstat 4 files changed, 24 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/fdl/FederatedLinda.java	Mon Feb 08 11:07:57 2010 +0900
+++ b/src/fdl/FederatedLinda.java	Tue Feb 09 06:14:52 2010 +0900
@@ -162,7 +162,7 @@
 		return key_num;
 	}
 
-	private void queueExec() {
+	public void queueExec() {
 		while (q_top != null){
 			PSXQueue c = q_top;
 			c.send();
--- a/src/fdl/MetaLinda.java	Mon Feb 08 11:07:57 2010 +0900
+++ b/src/fdl/MetaLinda.java	Tue Feb 09 06:14:52 2010 +0900
@@ -107,6 +107,7 @@
 
 	public int sync(long timeout) {
 		fds.checkTuple(timeout); // fdl sync is also handled here
+		fdl.queueExec();
 		/*
 		 * r.callback() may call meta.sync() and modifies the
 		 * replies queue. Do current size of queue only. The
--- a/src/fdl/test/debug/ConfigurationManagerEngine.java	Mon Feb 08 11:07:57 2010 +0900
+++ b/src/fdl/test/debug/ConfigurationManagerEngine.java	Tue Feb 09 06:14:52 2010 +0900
@@ -83,7 +83,7 @@
 		// regist poll tuple id
 		ml.in(MANAGE, new AcceptNewNode());
 		while (running)
-			ml.sync();
+			ml.sync(1);
 	}
 	
 	private void linkNodes() {
@@ -112,11 +112,11 @@
 			nodes[i].debugConnectionXML = debug.createXML();
 			nodes[i].linda.out(DEBUG, ByteBuffer.wrap(nodes[i].debugConnectionXML.getBytes()));
 			print(nodes[i].debugConnectionXML);
-			try {
-				nodes[i].linda.sync(1);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+//			try {
+//				nodes[i].linda.sync(1);
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//			}
 		}
 	}
 	
@@ -143,11 +143,11 @@
 			nodes[i].debugRoutingXML = debug.createXML();
 			nodes[i].linda.out(DEBUG, ByteBuffer.wrap(nodes[i].debugRoutingXML.getBytes()));
 			print(nodes[i].debugRoutingXML);
-			try {
-				nodes[i].linda.sync(1);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+//			try {
+//				nodes[i].linda.sync(1);
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//			}
 		}
 	}
 	
--- a/src/fdl/test/debug/MetaProtocolEngine.java	Mon Feb 08 11:07:57 2010 +0900
+++ b/src/fdl/test/debug/MetaProtocolEngine.java	Tue Feb 09 06:14:52 2010 +0900
@@ -144,11 +144,11 @@
 				Integer dstId = it.next();
 				Routing r = nodes.get(dstId);
 				r.linda.out(r.dstId, reply);
-				try {
-					r.linda.sync(1);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
+//				try {
+//					r.linda.sync(1);
+//				} catch (IOException e) {
+//					e.printStackTrace();
+//				}
 				ml.in(tid, this);
 			}
 		}
@@ -174,7 +174,7 @@
 	public void mainLoop() {
 		initPoller();
 		while (running) {
-			ml.sync();
+			ml.sync(1);
 		}
 	}
 	
@@ -188,11 +188,11 @@
 		ByteBuffer local;
 		local = ByteBuffer.wrap((localHostName + ":" + new Integer(localPort).toString()).getBytes());
 		manager.out(MANAGE, local);
-		try {
-			manager.sync(1);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+//		try {
+//			manager.sync(1);
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
 	}
 
 	protected PSXLinda connectServer(String hostName, int port) {