# HG changeset patch # User Nozomi Teruya # Date 1455112486 -32400 # Node ID 4a8755a30aa8b93b5e93b4c2f32c812ff808a502 # Parent e9005f975703e2823efcd6cea01d702d79bebc2d add topology manager number to 'host' key diff -r e9005f975703 -r 4a8755a30aa8 .idea/workspace.xml --- a/.idea/workspace.xml Sat Jan 30 21:12:23 2016 +0900 +++ b/.idea/workspace.xml Wed Feb 10 22:54:46 2016 +0900 @@ -2,16 +2,16 @@ - - - - - - - + + + + + + + @@ -46,41 +46,101 @@ + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + - - + + - - + + - - + + + + + + + + + + + + - - + + + + + + + + + + + + @@ -251,6 +311,21 @@ + + + - + + + + + + + + + + + + + + @@ -401,6 +551,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + @@ -477,50 +745,80 @@ - + + + - + - - + + + +

+ + jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/IncomingReverseKey.class + 22 + +

jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class - 31 + 32 - + + jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/Start.class + 25 + + - jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class - 36 + file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java + 19 - + + file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java + 22 + + -

@@ -534,18 +832,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -553,15 +993,63 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + diff -r e9005f975703 -r 4a8755a30aa8 build.gradle --- a/build.gradle Sat Jan 30 21:12:23 2016 +0900 +++ b/build.gradle Wed Feb 10 22:54:46 2016 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/e0be473562ca/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/6b7a96002adf/' } } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Wed Feb 10 22:54:46 2016 +0900 @@ -5,17 +5,19 @@ public class AliceVNC extends CodeSegment { + private int topMNumber; private AliceVNCConfig conf; - public AliceVNC(AliceVNCConfig conf) { + public AliceVNC(AliceVNCConfig conf, int topMNumber) { this.conf = conf; + this.topMNumber = topMNumber; } public void run() { System.out.println(); ods.put("AliceVNCConfig", conf); new ReceiveMeasurement(); - new CheckMyName(); + new CheckMyName(topMNumber); } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Wed Feb 10 22:54:46 2016 +0900 @@ -11,8 +11,10 @@ private Receiver info = ids.create(CommandType.TAKE); // current Server Info private AliceVNCMessage order; + private int topMNumber; - public CheckCurrentInfo(AliceVNCMessage order){ + public CheckCurrentInfo(AliceVNCMessage order, int topMNumber){ + this.topMNumber = topMNumber; info.setKey("currentServer"); this.order = order; } @@ -50,6 +52,6 @@ ods.update("currentServer", current); } } - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Wed Feb 10 22:54:46 2016 +0900 @@ -7,24 +7,28 @@ public class CheckMyName extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.PEEK); - public CheckMyName(){ - info.setKey("host"); + public CheckMyName(int topMNumber){ + this.topMNumber = topMNumber; + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } } @Override public void run() { - System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); + //System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); if ("node0".equals(info.asString())) { new CreateWindow("local"); - new NegotiateVNCServer(); + new NegotiateVNCServer(topMNumber); } else { new CreateWindow("parent"); } - new ReceiveAliceVNCMessage(); - new SendChangeRequest(); + new ReceiveAliceVNCMessage(topMNumber); + new SendChangeRequest(topMNumber); } } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Wed Feb 10 22:54:46 2016 +0900 @@ -15,14 +15,16 @@ private Receiver info = ids.create(CommandType.PEEK); private Receiver info1 = ids.create(CommandType.PEEK); - public NegotiateVNCServer(){ - info.setKey("host"); + public NegotiateVNCServer(int topMNumber){ + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } info1.setKey("AliceVNCConfig"); } @Override public void run() { - System.out.println("NegotiateVNCServer host index:" + DataSegment.getLocal().getDSindex("host")); + //System.out.println("NegotiateVNCServer host index:" + DataSegment.getLocal().getDSindex("host")); AliceVNCConfig conf = info1.asClass(AliceVNCConfig.class); String hostname = info.asString(); diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Wed Feb 10 22:54:46 2016 +0900 @@ -8,10 +8,12 @@ import alice.datasegment.Receiver; public class ReceiveAliceVNCMessage extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.TAKE); private Receiver info1 = ids.create(CommandType.PEEK); // connection list - public ReceiveAliceVNCMessage() { + public ReceiveAliceVNCMessage(int topMNumber) { + this.topMNumber = topMNumber; info.setKey("AliceVNCMessage"); info1.setKey("_CLIST"); } @@ -27,14 +29,14 @@ if (clist.contains("parent")){ order.route.add(info.from); ods.put("parent", "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } else { // this node is root. order.route.add(info.from); if (order.messageID == MessageType.CurrentVNCInfo.getId()) { ods.put("currentServer", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } else { - new CheckCurrentInfo(order); // check change Server flag. + new CheckCurrentInfo(order, topMNumber); // check change Server flag. } } } else if (order.messageID == MessageType.StartNegotiate.getId()|| @@ -45,17 +47,17 @@ if (order.messageID == MessageType.StartNegotiate.getId()){ // negotiate VNCServer by Viewer ods.put("vncRight", true); - new NegotiateVNCServer(); - new ReceiveAliceVNCMessage(); + new NegotiateVNCServer(topMNumber); + new ReceiveAliceVNCMessage(topMNumber); } else if(order.messageID == MessageType.StopProxy.getId()) { - new StopProxy(); + new StopProxy(topMNumber); } else if (order.messageID == MessageType.DeniedRequest.getId()) { // pop up window or message } } else { String address = order.getNextAddress(); ods.put(address, "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } } } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Wed Feb 10 22:54:46 2016 +0900 @@ -10,13 +10,17 @@ public class SendChangeRequest extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.PEEK); // hostName private Receiver info1 = ids.create(CommandType.PEEK); // connection list private Receiver info2 = ids.create(CommandType.PEEK); // AliceVNCConfig private Receiver info3 = ids.create(CommandType.TAKE); // request - public SendChangeRequest(){ - info.setKey("host"); + public SendChangeRequest(int topMNumber){ + this.topMNumber = topMNumber; + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } info1.setKey("_CLIST"); info2.setKey("AliceVNCConfig"); info3.setKey("Request"); @@ -41,7 +45,7 @@ } ods.put(address, "AliceVNCMessage", mes); - new SendChangeRequest(); + new SendChangeRequest(topMNumber); } } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Wed Feb 10 22:54:46 2016 +0900 @@ -14,17 +14,17 @@ public class StartAliceVNC { public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); + LinkedList topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); - AliceVNC cs = new AliceVNC(conf); + AliceVNC cs = new AliceVNC(conf, topologyNodeConfigs.size()); if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList()); - cs.ods.put("host", "node0"); + //cs.ods.put("host", "node0"); cs.execute(); return; } - LinkedList topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); new TopologyNode(topologyNodeConfigs, cs); } diff -r e9005f975703 -r 4a8755a30aa8 src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Wed Feb 10 22:54:46 2016 +0900 @@ -8,9 +8,11 @@ public class StopProxy extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.TAKE); - public StopProxy() { + public StopProxy(int topMNumber) { + this.topMNumber = topMNumber; info.setKey("viewer"); } @Override @@ -18,7 +20,7 @@ System.out.println("call clean up session"); Viewer v = info.asClass(Viewer.class); v.closeApp(); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } }