# HG changeset patch # User tatsuki # Date 1404552475 -32400 # Node ID 74e13553e3e313669b293d3eecf00e65b7bd7dff # Parent e501afa00369002d09c766eba5b8e4e2e153f565 change call do setKey in constractor diff -r e501afa00369 -r 74e13553e3e3 src/main/java/alice/topology/manager/IncomingHosts.java --- a/src/main/java/alice/topology/manager/IncomingHosts.java Sat Jul 05 16:10:57 2014 +0900 +++ b/src/main/java/alice/topology/manager/IncomingHosts.java Sat Jul 05 18:27:55 2014 +0900 @@ -12,38 +12,40 @@ import alice.topology.HostMessage; public class IncomingHosts extends CodeSegment { - - HashMap> topology; - LinkedList nodeNames; - Receiver host = ids.create(CommandType.TAKE); - - public IncomingHosts(HashMap> topology, LinkedList nodeNames) { - this.topology = topology; - this.nodeNames = nodeNames; - } + + HashMap> topology; + LinkedList nodeNames; + Receiver host = ids.create(CommandType.TAKE); + + public IncomingHosts(HashMap> topology, + LinkedList nodeNames) { + this.topology = topology; + this.nodeNames = nodeNames; + this.host.setKey("local", "host"); + } - @Override - public void run() { - HostMessage host = this.host.asClass(HostMessage.class); - String nodeName = nodeNames.poll(); - // Manager connect to Node - DataSegment.connect(nodeName, "", host.name, host.port); - ods.put(nodeName, "host", nodeName); - LinkedList nodes = topology.get(nodeName); - for (NodeInfo nodeInfo : nodes) { - HostMessage newHost = new HostMessage(host.name, host.port, nodeInfo.connectionName, nodeInfo.reverseName); - ods.put("local", nodeInfo.sourceNodeName, newHost); - } - - if (nodeNames.isEmpty()) { - // configuration finish - for (String key : topology.keySet()) { - ods.put("local", key, ValueFactory.createNilValue()); - } - } else { - IncomingHosts cs = new IncomingHosts(topology, nodeNames); - cs.host.setKey("local", "host"); - } - } + @Override + public void run() { + HostMessage host = this.host.asClass(HostMessage.class); + String nodeName = nodeNames.poll(); + // Manager connect to Node + DataSegment.connect(nodeName, "", host.name, host.port); + ods.put(nodeName, "host", nodeName); + LinkedList nodes = topology.get(nodeName); + for (NodeInfo nodeInfo : nodes) { + HostMessage newHost = new HostMessage(host.name, host.port, + nodeInfo.connectionName, nodeInfo.reverseName); + ods.put("local", nodeInfo.sourceNodeName, newHost); + } + + if (nodeNames.isEmpty()) { + // configuration finish + for (String key : topology.keySet()) { + ods.put("local", key, ValueFactory.createNilValue()); + } + } else { + new IncomingHosts(topology, nodeNames); + } + } } diff -r e501afa00369 -r 74e13553e3e3 src/main/java/alice/topology/manager/StartTopologyManager.java --- a/src/main/java/alice/topology/manager/StartTopologyManager.java Sat Jul 05 16:10:57 2014 +0900 +++ b/src/main/java/alice/topology/manager/StartTopologyManager.java Sat Jul 05 18:27:55 2014 +0900 @@ -76,8 +76,7 @@ e.printStackTrace(); } - IncomingHosts cs1 = new IncomingHosts(topology, nodeNames); - cs1.host.setKey("local", "host"); + new IncomingHosts(topology, nodeNames); ConfigWaiter cs3 = new ConfigWaiter(nodeNum); cs3.done.setKey("local", "done");