Mercurial > hg > Database > Christie
changeset 176:6eb548c188e5
update add Message
line wrap: on
line diff
--- a/src/main/java/christie/test/topology/localTestTopology/LTRemoteIncrement.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/test/topology/localTestTopology/LTRemoteIncrement.java Fri Feb 01 12:28:23 2019 +0900 @@ -4,6 +4,7 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.topology.Message; import christie.topology.node.TopologyNodeConfig; import java.util.List; @@ -24,7 +25,7 @@ System.out.println("node: " + " num = " + num); if (num == 3) { - getDGM(topologyNodeConfig.getManagerKey()).put("finish", ""); + getDGM(topologyNodeConfig.getManagerKey()).put("FINISHMESSAGE", new Message()); } else { num++; getDGM("right").put("num", num);
--- a/src/main/java/christie/test/topology/treeTestTopology/ParentCodeGear.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/test/topology/treeTestTopology/ParentCodeGear.java Fri Feb 01 12:28:23 2019 +0900 @@ -4,6 +4,7 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.topology.Message; import christie.topology.TopologyDataGear; import christie.topology.node.TopologyNodeConfig; @@ -27,7 +28,7 @@ protected void run(CodeGearManager cgm) { System.out.println(topoDG.getNodeName() + " : " + childNodeName + " accept"); if(countNodeNum == maxNodeNum){ - getDGM(topologyNodeConfig.getManagerKey()).put("finish", ""); + getDGM(topologyNodeConfig.getManagerKey()).put("FINISHMESSAGE", new Message()); }else{ getLocalDGM().put("countNodeNum", countNodeNum + 1); cgm.setup(new ParentCodeGear());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/topology/Message.java Fri Feb 01 12:28:23 2019 +0900 @@ -0,0 +1,9 @@ +package christie.topology; + +@org.msgpack.annotation.Message +public class Message { + + public Message(){ + + } +}
--- a/src/main/java/christie/topology/manager/ConfigWaiter.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/manager/ConfigWaiter.java Fri Feb 01 12:28:23 2019 +0900 @@ -5,6 +5,7 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.topology.Message; import java.util.LinkedList; @@ -15,7 +16,7 @@ LinkedList<String> waiterNodeNames; @Take - String nodePrepareDone; + Message _DONEMESSAGE; @Take int nodeNum; @@ -26,8 +27,8 @@ protected void run(CodeGearManager cgm) { nodeNum--; if (nodeNum == 0) { - getLocalDGM().put("start", "start"); - for (String nodeName: waiterNodeNames) getDGM(nodeName).put("start", "start"); + getLocalDGM().put("_STARTMESSAGE", new Message()); + for (String nodeName: waiterNodeNames) getDGM(nodeName).put("_STARTMESSAGE", new Message()); getLocalDGM().put("startTime", System.currentTimeMillis()); getLocalDGM().put("running", true);
--- a/src/main/java/christie/topology/manager/CreateTreeTopology.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/manager/CreateTreeTopology.java Fri Feb 01 12:28:23 2019 +0900 @@ -6,6 +6,7 @@ import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; import christie.topology.HostMessage; +import christie.topology.Message; import christie.topology.TopologyDataGear; import java.util.HashMap; @@ -59,7 +60,6 @@ if (hostCount == 0) { // どこにも繋がれるところがないので, ルートのとき. - } else { // put parent information own String parentNodeName = parentManager.getMyParent(); @@ -83,9 +83,10 @@ getLocalDGM().put("nameTable", nameTable); getLocalDGM().put("parentManager", parentManager); - getDGM(nodeName).put("remoteNodeInfo", new HostMessage() ); - getDGM(nodeName).put("reverseNodeName", ""); - getDGM(nodeName).put("start", "start"); + getDGM(nodeName).put("connectNodeNum", 1); + getDGM(nodeName).put("remoteNodeInfo", new HostMessage()); + getDGM(nodeName).put("_CONNECTIONMESSAGE", new Message()); + getDGM(nodeName).put("_STARTMESSAGE", new Message()); getLocalDGM().put("startTime", System.currentTimeMillis()); cgm.setup(new CreateTreeTopology());
--- a/src/main/java/christie/topology/manager/IncomingHosts.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/manager/IncomingHosts.java Fri Feb 01 12:28:23 2019 +0900 @@ -6,6 +6,7 @@ import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; import christie.topology.HostMessage; +import christie.topology.Message; import christie.topology.TopologyDataGear; import java.util.HashMap; @@ -49,12 +50,11 @@ absCookieTable.put(MD5, nodeName); getLocalDGM().put("absCookieTable", absCookieTable); - getDGM(nodeName).put("cookie", MD5); LinkedList<HostMessage> nodeInfoList = resultParse.get(nodeName); put(nodeName, "connectNodeNum", nodeInfoList.size()); - if(nodeInfoList.size() == 0) put(nodeName,"reverseNodeName", ""); + if(nodeInfoList.size() == 0) put(nodeName,"_CONNECTIONMESSAGE", new Message()); for (HostMessage nodeInfo : nodeInfoList) { @@ -94,9 +94,10 @@ } put(key, "remoteNodeInfo", new HostMessage()); // end mark } + }else{ + cgm.setup(new IncomingHosts()); } getLocalDGM().put("resultParse", resultParse); - cgm.setup(new IncomingHosts()); } }
--- a/src/main/java/christie/topology/manager/TopologyFinish.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/manager/TopologyFinish.java Fri Feb 01 12:28:23 2019 +0900 @@ -4,11 +4,12 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.topology.Message; public class TopologyFinish extends CodeGear { @Take - String finish; + Message FINISHMESSAGE; @Peek TopologyManagerConfig topologyManagerConfig; @@ -24,7 +25,7 @@ for(String dgm : cgm.getDGMList().keySet()){ - getDGM(dgm).put("_CLOSEMESSEAGE", "_CLOSEMESSEAGE"); + getDGM(dgm).put("_CLOSEMESSEAGE", new Message()); getDGM(dgm).shutdown(); }
--- a/src/main/java/christie/topology/manager/TopologyManager.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/manager/TopologyManager.java Fri Feb 01 12:28:23 2019 +0900 @@ -8,6 +8,7 @@ import java.util.LinkedList; import christie.topology.HostMessage; +import christie.topology.Message; public class TopologyManager extends CodeGear { @@ -24,7 +25,7 @@ if(topologyManagerConfig.dynamic) { getLocalDGM().put("running", true); - getLocalDGM().put("start", "start"); + getLocalDGM().put("_STARTMESSAGE", new Message()); if (topologyManagerConfig.type == TopologyType.Tree) { getLocalDGM().put("parentManager", new ParentManager(topologyManagerConfig.hasChild));
--- a/src/main/java/christie/topology/node/ConfigurationFinish.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/node/ConfigurationFinish.java Fri Feb 01 12:28:23 2019 +0900 @@ -4,15 +4,14 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.daemon.Config; +import christie.topology.Message; import christie.topology.TopologyDataGear; public class ConfigurationFinish extends CodeGear { @Take - String reverseNodeName; - - @Take - int reverseCount; + Message _CONNECTIONMESSAGE; @Peek int connectNodeNum; @@ -20,15 +19,19 @@ @Peek TopologyNodeConfig topologyNodeConfig; + int reverseCount; - public ConfigurationFinish() { + public ConfigurationFinish(){reverseCount = 0;} + + public ConfigurationFinish(int reverseCount) { + this.reverseCount = reverseCount; } @Override protected void run(CodeGearManager cgm) { reverseCount++; if (reverseCount >= connectNodeNum) { - getDGM(topologyNodeConfig.getManagerKey()).put("nodePrepareDone", "done"); + getDGM(topologyNodeConfig.getManagerKey()).put("_DONEMESSAGE", new Message()); cgm.setup(new Start()); @@ -42,8 +45,7 @@ return; }else { - getLocalDGM().put("reverseCount", reverseCount); - cgm.setup(new ConfigurationFinish()); + cgm.setup(new ConfigurationFinish(reverseCount)); } } }
--- a/src/main/java/christie/topology/node/IncomingConnectionInfo.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/node/IncomingConnectionInfo.java Fri Feb 01 12:28:23 2019 +0900 @@ -6,6 +6,7 @@ import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; import christie.topology.HostMessage; +import christie.topology.Message; import christie.topology.TopologyDataGear; @@ -14,11 +15,11 @@ @Take HostMessage remoteNodeInfo; - int count; - @Take TopologyDataGear topoDG; + int count; + public IncomingConnectionInfo() { this.count = 0; } @@ -34,6 +35,7 @@ if (remoteNodeInfo.getHostName().equals("")) { // end case getLocalDGM().put("topoDG", topoDG); + // returnしないとtopoDGが使えない. return; } @@ -43,10 +45,9 @@ topoDG.addConnection(connectionName); getLocalDGM().put("topoDG", topoDG); - getDGM(connectionName).put("reverseNodeName",connectionName); - count++; + getDGM(connectionName).put("_CONNECTIONMESSAGE",new Message()); - cgm.setup(new IncomingConnectionInfo(count)); + cgm.setup(new IncomingConnectionInfo(count + 1)); } }
--- a/src/main/java/christie/topology/node/PrepareToClose.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/node/PrepareToClose.java Fri Feb 01 12:28:23 2019 +0900 @@ -6,6 +6,7 @@ import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; import christie.datagear.DataGearManager; +import christie.topology.Message; import christie.topology.TopologyDataGear; import java.util.List; @@ -13,7 +14,7 @@ public class PrepareToClose extends CodeGear { @Take - String _CLOSEMESSEAGE; + Message _CLOSEMESSEAGE; @Peek TopologyDataGear topoDG;
--- a/src/main/java/christie/topology/node/Start.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/node/Start.java Fri Feb 01 12:28:23 2019 +0900 @@ -4,11 +4,12 @@ import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import christie.topology.Message; public class Start extends CodeGear { @Peek - String start; + Message _STARTMESSAGE; @Take CodeGear startCG;
--- a/src/main/java/christie/topology/node/TopologyNode.java Fri Jan 25 19:24:29 2019 +0900 +++ b/src/main/java/christie/topology/node/TopologyNode.java Fri Feb 01 12:28:23 2019 +0900 @@ -30,8 +30,6 @@ getDGM(topologyNodeConfig.getManagerKey()).put("hostMessage", hostMessage); - getLocalDGM().put("reverseCount", 0); - cgm.setup(new IncomingConnectionInfo()); cgm.setup(new ConfigurationFinish());