Changeset 3895 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers

Timestamp:

06/04/10 15:06:03 (14 years ago)

Author:

abeham

Message:

#866

• Improved exception handling and added default client

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers

Files:

• EvaluationProcessChannel.cs (modified) (2 diffs)
• EvaluationServiceClient.cs (modified) (6 diffs)
• EvaluationTCPChannel.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs

@@ -94 +94 @@
 
     public override void Send(IMessage message) {
-      streamingChannel.Send(message);
+      try {
+        streamingChannel.Send(message);
+      } catch {
+        Close();
+        throw;
+      }
     }
 
     public override IMessage Receive(IBuilder builder) {
-      return streamingChannel.Receive(builder);
+      try {
+        return streamingChannel.Receive(builder);
+      } catch {
+        Close();
+        throw;
+      }
     }
 
@@ -107 +117 @@
           streamingChannel.Close();
           if (!process.HasExited) {
-            process.CloseMainWindow();
-            process.WaitForExit(1000);
-            process.Close();
-            // for some reasons the event process_Exited does not fire
-            OnProcessExited();
+            try {
+              process.CloseMainWindow();
+              process.WaitForExit(1000);
+              process.Close();
+            } catch { }
           }
+          // for some reasons the event process_Exited does not fire
+          OnProcessExited();
         }
         process = null;

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Parameters;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -38 +39 @@
       get { return (IValueParameter<IEvaluationChannel>)Parameters["Channel"]; }
     }
+    public IValueParameter<IntValue> RetryParameter {
+      get { return (IValueParameter<IntValue>)Parameters["Retry"]; }
+    }
 
     private IEvaluationChannel Channel {
@@ -46 +50 @@
       : base() {
       Parameters.Add(new ValueParameter<IEvaluationChannel>("Channel", "The channel over which to call the remote function."));
+      Parameters.Add(new ValueParameter<IntValue>("Retry", "How many times the client should retry obtaining a quality in case there is an exception. Note that it immediately aborts when the channel cannot be opened.", new IntValue(10)));
     }
 
@@ -51 +56 @@
     
     public QualityMessage Evaluate(SolutionMessage solution) {
-      CheckAndOpenChannel();
-      Channel.Send(solution);
-      return (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+      int tries = 0, maxTries = RetryParameter.Value.Value;
+      bool success = false;
+      QualityMessage result = null;
+      while (!success) {
+        try {
+          tries++;
+          CheckAndOpenChannel();
+          Channel.Send(solution);
+          result = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+          success = true;
+        } catch (InvalidOperationException) {
+          throw;
+        } catch {
+          if (tries >= maxTries)
+            throw;
+        }
+      }
+      return result;
     }
 
     public void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback) {
-      CheckAndOpenChannel();
-      Channel.Send(solution);
+      int tries = 0, maxTries = RetryParameter.Value.Value;
+      bool success = false;
+      while (!success) {
+        try {
+          tries++;
+          CheckAndOpenChannel();
+          Channel.Send(solution);
+          success = true;
+        } catch (InvalidOperationException) {
+          throw;
+        } catch {
+          if (tries >= maxTries)
+            throw;
+        }
+      }
       System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ReceiveAsync), callback);
     }
@@ -69 +102 @@
         try {
           Channel.Open();
-        } catch (Exception e) { // TODO: Change to specific exception
+        } catch (Exception e) {
           throw new InvalidOperationException(Name + ": The channel could not be opened.", e);
         }
@@ -76 +109 @@
 
     private void ReceiveAsync(object callback) {
-      QualityMessage message = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+      QualityMessage message = null;
+      try {
+        message = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
+      } catch { }
       ((Action<QualityMessage>)callback).Invoke(message);
     }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationTCPChannel.cs

@@ -89 +89 @@
       } catch (SocketException) {
         Close();
+        throw;
       } catch (ObjectDisposedException) {
         socket = null;
         Close();
+        throw;
       }
     }
@@ -122 +124 @@
       } catch (SocketException) {
         Close();
+        throw;
       } catch (ObjectDisposedException) {
         socket = null;
         Close();
+        throw;
       }
-      return null;
     }
 
@@ -157 +160 @@
     public override void Close() {
       if (socket != null) {
-        if (socket.Connected)
-          socket.Disconnect(false);
-        socket.Close();
+        try {
+          if (socket.Connected)
+            socket.Disconnect(false);
+          socket.Close();
+        } catch { }
         socket = null;
       }