Changeset 4338 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

Timestamp:

08/27/10 13:25:48 (14 years ago)

Author:

cneumuel

Message:

improved stateless WCF-Proxy client with ServicePool

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (20 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -78 +78 @@
     public event EventHandler Connected;
 
+    SlaveFacadeServicePool servicePool;
+
     /// <summary>
     /// Constructor
@@ -97 +99 @@
           return;
         }
+        servicePool = new SlaveFacadeServicePool(ServerIp);
 
         Logger.Debug("Creating the new connection proxy");
-        client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        client = servicePool.CreateStreamedSlaveFacade();
         Logger.Debug("Created the new connection proxy");
 
@@ -116 +119 @@
       }
       finally {
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
       }
     }
@@ -146 +149 @@
         if (ConnState == NetworkEnum.WcfConnState.Connected) {
           Logger.Debug("STARTED: Login Sync");
-          client = ServiceLocator.CreateSlaveFacade(ServerIp);
+          client = servicePool.CreateSlaveFacade();
           Response res = client.Login(slaveInfo);
           if (res.StatusMessage != ResponseStatus.Ok) {
@@ -161 +164 @@
       }
       finally {
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
       }
     }
@@ -173 +176 @@
       if (LoggedIn) {
         Logger.Debug("STARTED: Fetching of Jobs from Server for Slave");
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         //client.GetStreamedJobAsync(guid);
         client.BeginGetStreamedJob(guid, (ar => {
@@ -214 +217 @@
             HandleNetworkError(new FaultException("GetJobAsync did not complete"));
 
-          ServiceLocator.DisposeSlaveClient(client);
+          servicePool.DisposeSlaveClient(client);
         }), null);
       }
@@ -234 +237 @@
         Logger.Debug("Making the call");
         //proxy.StoreFinishedJobResultStreamedAsync(stream, stream);
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         client.BeginStoreFinishedJobResultStreamed(stream, (ar => {
           Logger.Debug("Finished storing the job");
@@ -249 +252 @@
             HandleNetworkError(new FaultException("GetFinishedJobResultAsync did not complete"));
           }
-          ServiceLocator.DisposeSlaveClient(client);
+          servicePool.DisposeSlaveClient(client);
         }), null);
       }
@@ -262 +265 @@
         Stream stream = GetStreamedJobResult(clientId, jobId, result, percentage, exception);
         //proxy.ProcessSnapshotStreamedAsync(stream, stream);
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         client.BeginProcessSnapshotStreamed(stream, (ar => {
           if (stream != null)
@@ -274 +277 @@
             HandleNetworkError(new FaultException("ProcessSnapshotAsync did not complete"));
           }
-          ServiceLocator.DisposeSlaveClient(client);
+          servicePool.DisposeSlaveClient(client);
         }), null);
       }
@@ -291 +294 @@
         Logger.Debug("STARTING: sending heartbeat");
         //proxy.ProcessHeartBeatAsync(hbd);
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         client.BeginProcessHeartBeat(hbd, (ar => {
           if (ar.IsCompleted) {
@@ -304 +307 @@
             HandleNetworkError(new FaultException("ProcessHeartBeatAsync did not complete"));
           }
-          ServiceLocator.DisposeSlaveClient(client);
+          servicePool.DisposeSlaveClient(client);
         }), null);
       }
@@ -334 +337 @@
 
     public ResponseResultReceived StoreFinishedJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
-      SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+      SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
       ResponseResultReceived res = client.StoreFinishedJobResultStreamed(GetStreamedJobResult(clientId, jobId, result, percentage, exception));
-      ServiceLocator.DisposeSlaveClient(client);
+      servicePool.DisposeSlaveClient(client);
       return res;
     }
@@ -343 +346 @@
       try {
         Logger.Debug("STARTING: Sync call: IsJobStillNeeded");
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         Response res = client.IsJobStillNeeded(jobId);
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         Logger.Debug("ENDED: Sync call: IsJobStillNeeded");
         return res;
@@ -357 +360 @@
     public ResponseResultReceived ProcessSnapshotSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
       try {
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         var res = client.ProcessSnapshotStreamed(GetStreamedJobResult(clientId, jobId, result, percentage, exception));
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         return res;
       }
@@ -372 +375 @@
         Logger.Debug("STARTED: Requesting Plugins for Job");
         Logger.Debug("STARTED: Getting the stream");
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         Stream stream = client.GetStreamedPlugins(requestedPlugins.ToArray());
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         Logger.Debug("ENDED: Getting the stream");
         BinaryFormatter formatter = new BinaryFormatter();
@@ -393 +396 @@
       try {
         Logger.Debug("STARTED: Logout");
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         client.Logout(guid);
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         Logger.Debug("ENDED: Logout");
       }
@@ -406 +409 @@
       try {
         Logger.Debug("STARTED: Syncing Calendars");
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         ResponseCalendar cal = client.GetCalendar(clientId);
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         Logger.Debug("ENDED: Syncing Calendars");
         return cal;
@@ -421 +424 @@
       try {
         Logger.Debug("STARTED: Setting Calendar status to: " + state);
-        SlaveService.ISlaveFacade client = ServiceLocator.CreateStreamedSlaveFacade(ServerIp);
+        SlaveService.ISlaveFacade client = servicePool.CreateStreamedSlaveFacade();
         Response resp = client.SetCalendarStatus(clientId, state);
-        ServiceLocator.DisposeSlaveClient(client);
+        servicePool.DisposeSlaveClient(client);
         Logger.Debug("ENDED: Setting Calendar status to: " + state);
         return resp;