Changeset 13541 for branches/thasling

Timestamp:

01/18/16 15:15:19 (9 years ago)

Author:

thasling

Message:

added new empty project for test on hive
changed scheme for ip determination
changed handling of queues in messagehandler

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core.Host/App.config (modified) (1 diff)
• DistributedGA.Core.Host/DistributedGA.Core.Host.csproj (modified) (1 diff)
• DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (7 diffs)
• DistributedGA.Core/Implementation/WcfMessageService.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (5 diffs)
• DistributedGA.Hive (added)
• DistributedGA.Hive/App.config (added)
• DistributedGA.Hive/DistributedGA.Hive.csproj (added)
• DistributedGA.Hive/Program.cs (added)
• DistributedGA.Hive/Properties (added)
• DistributedGA.Hive/Properties/AssemblyInfo.cs (added)
• DistributedGA.Test/DistributedGA.Test.csproj (modified) (1 diff)

branches/thasling/DistributedGA/DistributedGA.Core.Host/App.config

@@ -6 +6 @@
   <appSettings>
     <add key="ContactServerURL" value="http://localhost:9090/DistributedGA.ContactServer/ContactService"/>
+    <add key="LanIpPrefix" value="10."/>
   </appSettings>
 </configuration>

branches/thasling/DistributedGA/DistributedGA.Core.Host/DistributedGA.Core.Host.csproj

@@ -46 +46 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>

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

@@ -2 +2 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
 using DistributedGA.Core.Domain;
 using DistributedGA.Core.Interface;
@@ -20 +21 @@
     //provides current population for the higher layer IMigrationOperator
     //to queues are used to gather and and provide population more efficiently
-    private ConcurrentQueue<SolutionInfo> collectedResults1;
-    private ConcurrentQueue<SolutionInfo> collectedResults2;
+    private object activeQueueLocker = new object();
+    private ConcurrentQueue<SolutionInfo> writeQueue;
+    private ConcurrentQueue<SolutionInfo> readQueue;
     private bool collectingInFirstQueue = true; //currently first queue is filled with recieved populations
 
     //uses IMessageService for recieving population from one peer at once
     private IMessageService host = null;
+
+
 
     public void Init() {
@@ -35 +39 @@
         }; // TODO: get own peerinfo
 
-        collectedResults1 = new ConcurrentQueue<SolutionInfo>();
-        collectedResults2 = new ConcurrentQueue<SolutionInfo>();
+        writeQueue = new ConcurrentQueue<SolutionInfo>();
+        readQueue = new ConcurrentQueue<SolutionInfo>();
 
         host = new WcfMessageService();
@@ -82 +86 @@
       try {
         List<SolutionInfo> res = new List<SolutionInfo>();
-        ConcurrentQueue<SolutionInfo> source = null;
         SolutionInfo item = null;
-        if (collectingInFirstQueue) {
-          collectingInFirstQueue = false; //switching queue
-          source = collectedResults1;
-        } else {
-          collectingInFirstQueue = true; //switching queue
-          source = collectedResults2;
+        lock (activeQueueLocker) {
+          var tmp = readQueue;
+          readQueue = writeQueue;
+          writeQueue = tmp;
         }
+
         //creating resultset
-        while (!source.IsEmpty) {
-          if (source.TryDequeue(out item)) {
+        while (!readQueue.IsEmpty) {
+          if (readQueue.TryDequeue(out item)) {
             res.Add(item);
           }
@@ -114 +116 @@
     private string GetExternalIpAddress() {
       try {
-        string externalIP;
-        externalIP = (new WebClient()).DownloadString("http://checkip.dyndns.org/");
-        externalIP = (new Regex(@"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"))
-                     .Matches(externalIP)[0].ToString();
-        return externalIP;
+        var strHostName = Dns.GetHostName();
+        // Then using host name, get the IP address list..
+        IPHostEntry ipEntry = Dns.GetHostEntry(strHostName);
+        IPAddress[] addr = ipEntry.AddressList;
+
+        return addr
+          .Select(ip => ip.ToString())
+          .First(str => str.StartsWith(ConfigurationManager.AppSettings["LanIpPrefix"]));
       } catch { return null; }
     }
@@ -124 +129 @@
     private void OnPopulationRecieved(object sender, MessageRecieveEventArgs e) {
       if (e != null) {
-        foreach (SolutionInfo si in e.Population) {
-          if (collectingInFirstQueue) {
-            collectedResults1.Enqueue(si);
-          } else {
-            collectedResults2.Enqueue(si);
+        lock (activeQueueLocker) {
+          foreach (SolutionInfo si in e.Population) {
+            writeQueue.Enqueue(si);
           }
         }
@@ -141 +144 @@
       }
     }
-
   }
 }

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

@@ -17 +17 @@
     public int Init(string ip) {
       int port = 0;
-      //port = GetRanodmFreePort();
       port = FreeTcpPort();
 

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

@@ -9 +9 @@
 namespace DistributedGA.Core.Implementation {
   public class WcfPeerListManager : IPeerListManager {
-    private string SERVER_STRING = null;
+    private string serverString = null;
 
     private IContactService client = null;
@@ -19 +19 @@
 
     public void Init(PeerInfo source) {
-      SERVER_STRING = ConfigurationManager.AppSettings["ContactServerURL"];
+      serverString = ConfigurationManager.AppSettings["ContactServerURL"];
       client = CreateClient();
       myself = source;
@@ -41 +41 @@
     private IContactService CreateClient() {
       var binding = new BasicHttpBinding();
-      var endpoint = new EndpointAddress(SERVER_STRING);
+      var endpoint = new EndpointAddress(serverString);
       var myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint);
 
@@ -52 +52 @@
       //communicate with 10% of the network
       int noOfPeers = allPeers.Count / 10;
-      List<Int32> indexList = GetRandomItemIndexes(noOfPeers, 0, allPeers.Count - 1);
+      List<int> indexList = GetRandomItemIndexes(noOfPeers, 0, allPeers.Count - 1);
       List<PeerInfo> res = new List<PeerInfo>();
-      foreach (Int32 index in indexList) {
+      foreach (int index in indexList) {
         res.Add(allPeers.ElementAt(index));
       }
@@ -60 +60 @@
     }
 
-    private List<Int32> GetRandomItemIndexes(int noOfItems, int minValue, int maxValue) {
-      List<Int32> res = new List<Int32>();
+    private List<int> GetRandomItemIndexes(int noOfItems, int minValue, int maxValue) {
+      List<int> res = new List<int>();
       Random rnd = new Random();
       int tmp = -1;

branches/thasling/DistributedGA/DistributedGA.Test/DistributedGA.Test.csproj

@@ -76 +76 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>