Changeset 805 for trunk/sources

Timestamp:

11/23/08 18:05:59 (16 years ago)

Author:

kgrading

Message:

work on #385, core problem still exists.

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/ServiceLocator.cs

@@ -13 +13 @@
         proxy = new ClientCommunicatorClient(
           new NetTcpBinding(),
-          new EndpointAddress("net.tcp://10.20.53.1:9000/HiveServer/ClientCommunicator")
+          new EndpointAddress("net.tcp://192.168.132.1:9000/HiveServer/ClientCommunicator")
           );
       }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -67 +67 @@
 
     public void Start() {
-      Heartbeat beat = new Heartbeat { Interval = 5000 };
+      Heartbeat beat = new Heartbeat { Interval = 30000 };
       beat.StartHeartbeat();
 

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -13 +13 @@
   public class ClientCommunicator: IClientCommunicator {
     List<ClientInfo> clients;
-    List<long> jobs;
+    LinkedList<long> jobs;
     int nrOfJobs = 10;
 
     public ClientCommunicator() {
-      jobs = new List<long>();
-      for (int i = 1; i < nrOfJobs; i++) {
-        jobs.Add(i);
+      jobs = new LinkedList<long>();
+      for (long i = 1; i < nrOfJobs; i++) {
+        jobs.AddFirst(i);
       }
     }
@@ -54 +54 @@
     public ResponseJob PullJob(Guid clientId) {
       ResponseJob response = new ResponseJob();
-
-      response.JobId = jobs.ElementAt(jobs.Count);
+      lock (this) {
+        response.JobId = jobs.Last.Value;
+        jobs.RemoveLast(); 
+      }
+      
       response.Success = true;
-      response.StatusMessage = "Job with id " + jobs.Count + " sent";
-      jobs.Remove(jobs.Count);
-
+      response.StatusMessage = "Job with id " + jobs.Count + " sent";     
       return response;
     }
@@ -70 +71 @@
       return response;
     }
-
+                           
     public Response Logout(Guid clientId) {
       bool clientRemoved = false;

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -36 +36 @@
       AutoRestart = true)]
   class HiveServerApplication : ApplicationBase {
-    const int port = 
+    const int port =
       9000;
 
@@ -43 +43 @@
 
     private bool AddMexEndpoint(ServiceHost serviceHost) {
-      if(serviceHost != null) {
+      if (serviceHost != null) {
         ServiceMetadataBehavior behavior =
             new ServiceMetadataBehavior();
-          serviceHost.Description.Behaviors.Add(behavior);
+        serviceHost.Description.Behaviors.Add(behavior);
 
-          return serviceHost.AddServiceEndpoint(
-            typeof(IMetadataExchange),
-            MetadataExchangeBindings.CreateMexTcpBinding(),
-            "mex") != null;
+        return serviceHost.AddServiceEndpoint(
+          typeof(IMetadataExchange),
+          MetadataExchangeBindings.CreateMexTcpBinding(),
+          "mex") != null;
       } else
         return false;
@@ -119 +119 @@
 
     public override void Run() {
-        IPAddress[] addresses = Dns.GetHostAddresses(Dns.GetHostName());
-        int index = 0;
-        if (System.Environment.OSVersion.Version.Major >= 6) {
-          for (index = addresses.Length - 1; index >= 0; index--)
-            if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
-              break;
-        }
+      IPAddress[] addresses = Dns.GetHostAddresses(Dns.GetHostName());
+      int index = 0;
+      if (System.Environment.OSVersion.Version.Major >= 6) {
+        for (index = addresses.Length - 1; index >= 0; index--)
+          if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+            break;
+      }
 
       Uri uriTcp =
           new Uri("net.tcp://" + addresses[index] + ":" + port + "/HiveServer/");
 
-      ServiceHost clientCommunicator = 
+      ServiceHost clientCommunicator =
         StartClientCommunicator(uriTcp);