Changeset 5707 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication

Timestamp:

03/16/11 13:31:37 (14 years ago)

Author:

cneumuel

Message:

#1260

• some changes due to the removal of Disposable (r5706)
• copy PluginInfrastructure files into PluginCache folder in slaves (needed due to r5703)

File:

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

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

@@ -24 +24 @@
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.ServiceModel;
 using HeuristicLab.Common;
 using HeuristicLab.Hive.Contracts;
@@ -31 +30 @@
 using HeuristicLab.Hive.Slave.Common;
 using HeuristicLab.Hive.Slave.Communication.SlaveFacade;
+using HeuristicLab.Hive.Tracing;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Hive.Tracing;
-using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Hive.Slave.Communication {
@@ -77 +75 @@
     public void Connect(SlaveDto slaveInfo) {
       RegisterServiceEvents();
-      using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+      using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
         try {
           Logger.Debug("Starting the Connection Process");
@@ -131 +129 @@
     public event System.EventHandler<EventArgs<Exception>> GetJobFailed;
     public void GetJobAsync(Guid guid) {
-      Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
+      DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
       Logger.Debug("STARTED: Fetching of Jobs from Server for Slave");
       service.Obj.BeginGetStreamedJob(guid, (ar => {
@@ -184 +182 @@
     public event System.EventHandler<StoreFinishedJobResultCompletedEventArgs> GetFinishedJobResultCompleted;
     public void GetFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, TimeSpan executionTime, string exception, bool finished) {
-      Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
+      DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
       Logger.Debug("STARTED: Sending back the finished job results");
       Logger.Debug("Building stream");
@@ -218 +216 @@
     public event System.EventHandler<ProcessSnapshotCompletedEventArgs> ProcessSnapshotCompleted;
     public void ProcessSnapshotAsync(Guid clientId, Guid jobId, byte[] result, TimeSpan executionTime, string exception, bool finished) {
-      Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
+      DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService();
 
       Stream stream = GetStreamedJobResult(clientId, jobId, result, executionTime, exception);
@@ -249 +247 @@
     public event EventHandler<ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
     public void ProcessHeartBeatSync(HeartBeatData hbd) {
-      using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.SlaveFacadePool.GetService()) {
+      using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.SlaveFacadePool.GetService()) {
         Logger.Debug("STARTING: sending heartbeat");
         var res = service.Obj.ProcessHeartBeat(hbd);
@@ -287 +285 @@
 
     public ResponseResultReceived StoreFinishedJobResultsSync(Guid clientId, Guid jobId, byte[] result, TimeSpan executionTime, string exception, bool finished) {
-      using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+      using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
         ResponseResultReceived res = service.Obj.StoreFinishedJobResultStreamed(GetStreamedJobResult(clientId, jobId, result, executionTime, exception));
         return res;
@@ -296 +294 @@
       try {
         Logger.Debug("STARTING: Sync call: IsJobStillNeeded");
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           Response res = service.Obj.IsJobStillNeeded(jobId);
           Logger.Debug("ENDED: Sync call: IsJobStillNeeded");
@@ -310 +308 @@
     public ResponseResultReceived ProcessSnapshotSync(Guid clientId, Guid jobId, byte[] result, TimeSpan executionTime, string exception) {
       try {
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           return service.Obj.ProcessSnapshotStreamed(GetStreamedJobResult(clientId, jobId, result, executionTime, exception));
         }
@@ -322 +320 @@
     public IEnumerable<CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
       try {
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           Logger.Debug("STARTED: Requesting Plugins for Job");
           Logger.Debug("STARTED: Getting the stream");
@@ -345 +343 @@
       try {
         Logger.Debug("STARTED: Logout");
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           service.Obj.Logout(guid);
         }
@@ -358 +356 @@
       try {
         Logger.Debug("STARTED: Syncing Calendars");
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           ResponseCalendar cal = service.Obj.GetCalendar(clientId);
           Logger.Debug("ENDED: Syncing Calendars");
@@ -373 +371 @@
       try {
         Logger.Debug("STARTED: Setting Calendar status to: " + state);
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           Response resp = service.Obj.SetCalendarStatus(clientId, state);
           Logger.Debug("ENDED: Setting Calendar status to: " + state);
@@ -388 +386 @@
       try {
         Logger.Debug("STARTED: Add Child Job for parent: " + parentJobId);
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           ResponseObject<JobDto> response = service.Obj.AddChildJob(parentJobId, serializedJob);
           Logger.Debug("ENDED: Add Child Job for parent: " + parentJobId);
@@ -403 +401 @@
       try {
         Logger.Debug("STARTED: Pausing job: " + serializedJob.JobInfo.Id);
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           ResponseObject<JobDto> response = service.Obj.PauseJob(serializedJob);
           Logger.Debug("ENDED: Pausing job: " + serializedJob.JobInfo.Id);
@@ -418 +416 @@
       try {
         Logger.Debug("STARTED: GetChildJobs job: " + parentJob);
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           SerializedJobList serializedJobs = new SerializedJobList();
           JobResult[] results = service.Obj.GetChildJobResults(new Guid?(parentJob), false, false);
@@ -439 +437 @@
     public void DeleteChildJobs(Guid jobId) {
       try {
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           service.Obj.DeleteChildJobs(jobId);
         }
@@ -450 +448 @@
     public HivePluginFile GetConfigurationFile() {
       try {
-        using (Disposable<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
+        using (DisposableWrapper<SlaveFacade.ISlaveFacade> service = ServiceLocator.Instance.StreamedSlaveFacadePool.GetService()) {
           var response = service.Obj.GetConfigurationFile();
           return response.Obj;