Changeset 615

Timestamp:

11/23/2008 11:51:42 PM (4 years ago)

Author:

cjax

Message:

Still Client could not connect to the server, however, the back bone is there.

File:

• branches/eraser6/Manager/RemoteExecutor.cs (modified) (11 diffs)

branches/eraser6/Manager/RemoteExecutor.cs

@@ -41 +41 @@
 
         private Thread thread = null;
-        private NamedPipeServerStream server = 
+        private NamedPipeServerStream server =
             new NamedPipeServerStream(ServerName, PipeDirection.InOut, 32,
                 PipeTransmissionMode.Message, PipeOptions.Asynchronous);
@@ -60 +60 @@
         }
 
-
         public void Abort()
         {
@@ -73 +72 @@
             while (Thread.CurrentThread.ThreadState != ThreadState.AbortRequested)
             {
-                if(!server.IsConnected)
-                    server.WaitForConnection(); 
+                if (!server.IsConnected)
+                    server.WaitForConnection();
 
                 while (server.Position < server.Length)
                     mstream.Write(buffer, 0, server.Read(buffer, 0, buffer.Length));
 
+                // the value should not stay null since we have to deserialise it 
                 object returnValue = null;
                 using (RemoteExecutorClient.RemoteHeader data = (RemoteExecutorClient.RemoteHeader)
                     new BinaryFormatter().Deserialize(mstream))
                 {
-
                     data.SerializationStream.Position = 0;
 
@@ -104 +103 @@
                         case RemoteExecutorClient.Function.ADD_TASK:
                             task = (Task)new BinaryFormatter().Deserialize(data.SerializationStream);
-                            returnValue = null;
+                            returnValue = new object();
                             break;
 
@@ -119 +118 @@
                         case RemoteExecutorClient.Function.SAVE_TASK_LIST:
                             stream = (Stream)new BinaryFormatter().Deserialize(data.SerializationStream);
-                            returnValue = null;
+                            returnValue = new object();
                             break;
 
@@ -128 +127 @@
                         // void \+ void
                         case RemoteExecutorClient.Function.RUN:
-                            returnValue = null;
+                            returnValue = new object();
                             break;
 
@@ -221 +220 @@
     {
         public static int Instances = 0;
-        public const string ClientName = "EraserRemoteExecutorClient";
+        public const string ClientName = "EraserRemoteExecutorClient_";
 
         private NamedPipeClientStream client = 
             new NamedPipeClientStream(RemoteExecutorServer.ServerName,
-                ClientName, PipeDirection.InOut);
+                ClientName + Instances.ToString(), PipeDirection.InOut);
 
         public enum Function : uint
@@ -268 +267 @@
             // initialise client and connect to the server
             object results = null;
-            IAsyncResult asyncResult;
+            IAsyncResult asyncResult = null;
+            client = new NamedPipeClientStream(RemoteExecutorServer.ServerName,
+                ClientName + Instances.ToString(), PipeDirection.InOut);
             
-            client.Connect(10000);
-
-            client.ReadMode = PipeTransmissionMode.Message;
-            client.Position = 0;            
+            // wait for a connection for at least 5s
+            client.Connect(5000);   
 
             // serialise the data
@@ -287 +286 @@
                     delegate(IAsyncResult ar)
                     {
-                        // completed
+                        // completed, might throw
                         client.EndWrite(ar);
 
@@ -296 +295 @@
                             ms.Write(buffer, 0, client.Read(buffer, 0, buffer.Length));
 
+                        // deserialise the result 
                         results = new BinaryFormatter().Deserialize(ms);
 
@@ -301 +301 @@
             }
 
-            // TODO: return the proper results
             return results;
         }