Changeset 14060

Timestamp:

07/13/16 15:37:29 (8 years ago)

Author:

thasling

Message:

#2615:
changed parameter in P2PMigrationAnalyzer, so that there is no invalid cast ExceptionThrown
other parameters still TBD
made WcfPeerListManager stateless by removing a stored ChannelFactory and creating a new one by each method call

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (5 diffs)
• DistributedGA.Hive/P2PMigrationAnalyzer.cs (modified) (2 diffs)

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

@@ -18 +18 @@
     private Object timerLock = new Object();
 
-    private ChannelFactory<IContactService> myChannelFactory;
-
-    private IContactService client;
-
     private List<PeerInfo> cachedPeerList;
 
@@ -34 +30 @@
       cachedPeerList = new List<PeerInfo>();
       rand = new Random();
-      //Init ChannelFactory and Client
-      var binding = new NetTcpBinding();
-      var endpoint = new EndpointAddress(serverString);
-      myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint);
-      client = myChannelFactory.CreateChannel();
-      //Register Peer
-      client.RegisterPeer(myself);
       //Start heartbeat timer
       timer = new Timer(1000 * 20); //each 20 seconds
@@ -52 +41 @@
 
     public void SendLogToServer(string msg) {
-      client.MakeLog(myself, msg);
+      var binding = new NetTcpBinding();
+      var endpoint = new EndpointAddress(serverString);
+      using (var myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint)) {
+        using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
+          ((IContactService)client).MakeLog(myself, msg);      
+        }
+      }
     }
 
@@ -58 +53 @@
       timer.Stop();
       timer.Dispose();
-      ((IClientChannel)client).Close();
-      myChannelFactory.Close();
-      myChannelFactory = null;
     }
 
@@ -86 +78 @@
       lock (timerLock) {
         try {
-          var allPeers = client.GetPeerList(myself);
+          List<PeerInfo> allPeers = new List<PeerInfo>();
+          var binding = new NetTcpBinding();
+          var endpoint = new EndpointAddress(serverString);
+          using (var myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint)) {
+            using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
+              allPeers = ((IContactService)client).GetPeerList(myself);            
+            }
+          }
           cachedPeerList = ChoosePeersForMessaging(ref allPeers);
         }

branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs

@@ -74 +74 @@
       get { return (IValueParameter<ILog>)Parameters["Log"]; }
     }
-    public ILookupParameter<StringValue> JobGuidParameter {
-      get { return (ILookupParameter<StringValue>)Parameters["JobGUID"]; }
+    public IValueParameter<StringValue> JobGuidParameter {
+      get { return (IValueParameter<StringValue>)Parameters["JobGUID"]; }
     }
 
@@ -118 +118 @@
       Parameters.Add(new ValueParameter<StringValue>("ContactServerURL", "", new StringValue("net.tcp://10.42.1.150:9090/DistributedGA.ContactServer/ContactService")));
       Parameters.Add(new ValueParameter<StringValue>("JobGUID", "", new StringValue(Guid.NewGuid().ToString())));
+    //public ILookupParameter<StringValue> JobGuidParameter {
+    //  get { return (ILookupParameter<StringValue>)Parameters["JobGUID"]; }
+    //}
+
       Parameters.Add(new ValueParameter<ILog>("Log", "The log", new Log(1000)));