merge -r 58060:58217

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Messaging / MonoMethodMessage.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
index 1f677e168a12b49ad5a9c06b1083acd3019d4238..32bee231a1ba4c72818cce50d9614a0b8063fb8b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
@@ -8,6 +8,29 @@
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
 using System.Reflection;
@@ -16,28 +39,29 @@ using System.Runtime.CompilerServices;
 namespace System.Runtime.Remoting.Messaging {
        
        [Serializable]
-       public class MonoMethodMessage : IMethodCallMessage, IMethodReturnMessage {
+       internal class MonoMethodMessage : IMethodCallMessage, IMethodReturnMessage, IInternalMessage {
 
+               #region keep in sync with MonoMessage in object-internals.h
                MonoMethod method;
-
                object []  args;
-
                string []  names;
-
-               byte [] arg_types; /* 1 == IN; 2 == OUT ; 3 = INOUT */
-
+               byte [] arg_types; /* 1 == IN; 2 == OUT; 3 == INOUT; 4 == COPY OUT */
                public LogicalCallContext ctx;
-
                public object rval;
-
                public Exception exc;
+               AsyncResult asyncResult;
+               CallType call_type;
+               #endregion
 
                string uri;
 
-               InternalDictionary properties;
+               MethodCallDictionary properties;
 
                Type[] methodSignature;
 
+               Identity identity;
+
+
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                internal extern void InitMessage (MonoMethod method, object [] out_args);
 
@@ -64,13 +88,16 @@ namespace System.Runtime.Remoting.Messaging {
                
                public IDictionary Properties {
                        get {
-                               if (properties == null) properties = new InternalDictionary (this);
+                               if (properties == null) properties = new MethodCallDictionary (this);
                                return properties;
                        }
                }
 
                public int ArgCount {
                        get {
+                               if (CallType == CallType.EndInvoke)
+                                       return -1;
+                                       
                                if (null == args)
                                        return 0;
 
@@ -94,6 +121,10 @@ namespace System.Runtime.Remoting.Messaging {
                        get {
                                return ctx;
                        }
+
+                       set {
+                               ctx = value;
+                       }
                }
 
                public MethodBase MethodBase {
@@ -160,6 +191,9 @@ namespace System.Runtime.Remoting.Messaging {
 
                public int InArgCount {
                        get {
+                               if (CallType == CallType.EndInvoke)
+                                       return -1;
+
                                if (null == args)
                                        return 0;
 
@@ -287,19 +321,54 @@ namespace System.Runtime.Remoting.Messaging {
                        return null;
                }
 
-               [Serializable]
-               class InternalDictionary : MethodCallDictionary\r
-               {\r
-                       public InternalDictionary(MonoMethodMessage message) : base (message) \r
-                       { \r
-                       }\r
+               Identity IInternalMessage.TargetIdentity
+               {
+                       get { return identity; }
+                       set { identity = value; }
+               }
+
+               public bool IsAsync
+               {
+                       get { return asyncResult != null; }
+               }
 
-                       protected override void SetMethodProperty (string key, object value)
+               public AsyncResult AsyncResult
+               {
+                       get { return asyncResult; }
+               }
+
+               internal CallType CallType
+               {
+                       get
                        {
-                               if (key == "__Uri") ((MonoMethodMessage)_message).Uri = (string)value;
-                               else base.SetMethodProperty (key, value);
+                               // FIXME: ideally, the OneWay type would be set by the runtime
+                               
+                               if (call_type == CallType.Sync && RemotingServices.IsOneWay (method))
+                                       call_type = CallType.OneWay;
+                               return call_type;
+                       }
+               }
+               
+               public bool NeedsOutProcessing (out int outCount) {
+                       bool res = false;
+                       outCount = 0;
+                       foreach (byte t in arg_types) {
+                               if ((t & 2) != 0)
+                                       outCount++;
+                               else if ((t & 4) != 0)
+                                       res = true;
                        }
+                       return outCount > 0 || res;
                }
+               
+       }
 
+       internal enum CallType: int
+       {
+               Sync = 0,
+               BeginInvoke = 1,
+               EndInvoke = 2,
+               OneWay = 3
        }
 }
+