# HG changeset patch # User Nozomi Teruya # Date 1452064203 -32400 # Node ID 6b0730c48b4e061c515a01ee24136b608ba6f756 # Parent a2cf391b8a34efd9408d2701ea028e2c124f0045 some change for MultiTopologyNodeConging diff -r a2cf391b8a34 -r 6b0730c48b4e .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r a2cf391b8a34 -r 6b0730c48b4e .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r a2cf391b8a34 -r 6b0730c48b4e .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r a2cf391b8a34 -r 6b0730c48b4e .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r a2cf391b8a34 -r 6b0730c48b4e .idea/workspace.xml --- a/.idea/workspace.xml Fri Dec 18 01:47:17 2015 +0900 +++ b/.idea/workspace.xml Wed Jan 06 16:10:03 2016 +0900 @@ -2,14 +2,10 @@ - - - - - - - + + + @@ -48,8 +44,50 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,11 +97,8 @@ - - - - - + + @@ -72,75 +107,37 @@ - - - - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + @@ -398,6 +395,17 @@ + + + @@ -504,6 +512,65 @@ + + + @@ -614,7 +783,7 @@ - + @@ -627,34 +796,36 @@ - + + + - + - - + + + +

- - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java - 17 - -

jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/31d343d6f447bc24a7971fe8821345868593a828/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class 43 @@ -746,21 +917,26 @@ - + - - - - - + + - - + + + + + + + + + + @@ -768,27 +944,66 @@ - - - - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - - + + + + + diff -r a2cf391b8a34 -r 6b0730c48b4e build.gradle --- a/build.gradle Fri Dec 18 01:47:17 2015 +0900 +++ b/build.gradle Wed Jan 06 16:10:03 2016 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/f4e5c31c98b9/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/63f2c08db5ee/' } } diff -r a2cf391b8a34 -r 6b0730c48b4e src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Fri Dec 18 01:47:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Wed Jan 06 16:10:03 2016 +0900 @@ -6,16 +6,18 @@ public class AliceVNC extends CodeSegment { private AliceVNCConfig conf; + private int topMNumber; - public AliceVNC(AliceVNCConfig conf) { + public AliceVNC(AliceVNCConfig conf, int topMNum) { this.conf = conf; + this.topMNumber = topMNum; } public void run() { System.out.println(); ods.put("AliceVNCConfig", conf); new ReceiveMeasurement(); - new CheckMyName(); + new CheckMyName(topMNumber); } diff -r a2cf391b8a34 -r 6b0730c48b4e src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Fri Dec 18 01:47:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Wed Jan 06 16:10:03 2016 +0900 @@ -8,19 +8,25 @@ public class CheckMyName extends CodeSegment { private Receiver info = ids.create(CommandType.PEEK); + private int topMNum; - public CheckMyName(){ + public CheckMyName(int topMNum){ info.setKey("host"); + info.setKey("managers"); + this.topMNum = topMNum; } @Override public void run() { - System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); - if ("node0".equals(info.asString())) { + int i; + for (i = 0; i < topMNum; i++){ + if (!"node0".equals(info.asString())) { + new CreateWindow("parent"); + } + } + if (i == topMNum) { new CreateWindow("local"); new NegotiateVNCServer(); - } else { - new CreateWindow("parent"); } new ReceiveAliceVNCMessage(); diff -r a2cf391b8a34 -r 6b0730c48b4e src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Fri Dec 18 01:47:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Wed Jan 06 16:10:03 2016 +0900 @@ -47,14 +47,14 @@ if (!info1.from.equals(node)) { // not need send data comes from // Data Segment from other node is already serialized - ods.put(node, "updateRectangle", info1.getReceiveData()); //TODO need timeout counter + ods.flip(node, "updateRectangle", info1); //TODO need timeout counter // for measurement ReceiveData r = info2.getReceiveData(); if (!r.getSetTime()) { r.setTimes(System.currentTimeMillis(), true, 0);//送信時間をセット } - ods.put(node, "pixelData", info2.getReceiveData()); + ods.flip(node, "pixelData", info2); } } diff -r a2cf391b8a34 -r 6b0730c48b4e src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Fri Dec 18 01:47:17 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Wed Jan 06 16:10:03 2016 +0900 @@ -1,6 +1,7 @@ package jp.ac.u_ryukyu.alicevnc; import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedList; import alice.daemon.AliceDaemon; @@ -15,19 +16,18 @@ public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); - AliceVNC cs = new AliceVNC(conf); + LinkedList topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); + + 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", new HashMap().put(conf.getManagerHostName(),"node0")); cs.execute(); return; } - LinkedList topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); - for(TopologyNodeConfig config : topologyNodeConfigs){ - new TopologyNode(config, cs); - } + new TopologyNode(topologyNodeConfigs, cs); } }