Merge pull request #111 from nayato/port

Moving towards .NET Platform compatibility

Author: nayato

src/DotNetty.Codecs/CodecException.cs

@@ -8,7 +8,6 @@ namespace DotNetty.Codecs
     /// <summary>
     ///     An <see cref="Exception" /> which is thrown by a codec.
     /// </summary>
-    [Serializable]
     public class CodecException : Exception
     {
         public CodecException()

src/DotNetty.Codecs/Strings/StringDecoder.cs

@@ -43,7 +43,7 @@ public class StringDecoder : MessageToMessageDecoder<IByteBuffer>
         ///     character set.
         /// </summary>
         public StringDecoder()
-            : this(Encoding.Default)
+            : this(Encoding.GetEncoding(0))
         {
         }
 

src/DotNetty.Codecs/Strings/StringEncoder.cs

@@ -40,7 +40,7 @@ public class StringEncoder : MessageToMessageEncoder<string>
         ///     character set.
         /// </summary>
         public StringEncoder()
-            : this(Encoding.Default)
+            : this(Encoding.GetEncoding(0))
         {
         }
 

src/DotNetty.Codecs/UnsupportedMessageTypeException.cs

@@ -9,13 +9,10 @@ namespace DotNetty.Codecs
     /// <summary>
     ///     Thrown if an unsupported message is received by an codec.
     /// </summary>
-    [Serializable]
     public class UnsupportedMessageTypeException : CodecException
     {
-        public UnsupportedMessageTypeException(
-            object message, params Type[] expectedTypes)
-            : base(ComposeMessage(
-                message?.GetType().Name ?? "null", expectedTypes))
+        public UnsupportedMessageTypeException(object message, params Type[] expectedTypes)
+            : base(ComposeMessage(message?.GetType().Name ?? "null", expectedTypes))
         {
         }
 

src/DotNetty.Common/Deque.cs

@@ -8,6 +8,7 @@ namespace Nito
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
+    using System.Reflection;
 
     /// <summary>
     ///     A double-ended queue (deque), which provides O(1) indexed access, O(1) removals from the front and back, amortized
@@ -276,12 +277,12 @@ bool ObjectIsT(object item)
 
             if (item == null)
             {
-                Type type = typeof(T);
-                if (type.IsClass && !type.IsPointer)
+                TypeInfo typeInfo = typeof(T).GetTypeInfo();
+                if (typeInfo.IsClass && !typeInfo.IsPointer)
                     return true; // classes, arrays, and delegates
-                if (type.IsInterface)
+                if (typeInfo.IsInterface)
                     return true; // interfaces
-                if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+                if (typeInfo.IsGenericType && typeInfo.GetGenericTypeDefinition() == typeof(Nullable<>))
                     return true; // nullable value types
             }
 

src/DotNetty.Common/ResourceLeakDetector.cs

@@ -6,7 +6,6 @@ namespace DotNetty.Common
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.Diagnostics.Contracts;
     using System.Runtime.CompilerServices;
     using System.Text;
@@ -210,7 +209,7 @@ public DefaultResourceLeak(ResourceLeakDetector owner, object referent)
                     DetectionLevel level = Level;
                     if (level >= DetectionLevel.Advanced)
                     {
-                        this.creationRecord = NewRecord(null, 3);
+                        this.creationRecord = NewRecord(null);
                     }
                     else
                     {
@@ -226,15 +225,15 @@ public DefaultResourceLeak(ResourceLeakDetector owner, object referent)
                 }
             }
 
-            public void Record() => this.RecordInternal(null, 3);
+            public void Record() => this.RecordInternal(null);
 
-            public void Record(object hint) => this.RecordInternal(hint, 3);
+            public void Record(object hint) => this.RecordInternal(hint);
 
-            void RecordInternal(object hint, int recordsToSkip)
+            void RecordInternal(object hint)
             {
                 if (this.creationRecord != null)
                 {
-                    string value = NewRecord(hint, recordsToSkip);
+                    string value = NewRecord(hint);
 
                     lock (this.lastRecords)
                     {
@@ -310,15 +309,7 @@ public override string ToString()
             }
         }
 
-        static readonly string[] StackTraceElementExclusions =
-        {
-            "DotNetty.Common.Utilities.ReferenceCountUtil.Touch(",
-            "DotNetty.Buffers.AdvancedLeakAwareByteBuf.Touch(",
-            "DotNetty.Buffers.AbstractByteBufAllocator.ToLeakAwareBuffer(",
-            "DotNetty.Buffers.AdvancedLeakAwareByteBuf.RecordLeakNonRefCountingOperation("
-        };
-
-        static string NewRecord(object hint, int recordsToSkip)
+        static string NewRecord(object hint)
         {
             Contract.Ensures(Contract.Result<string>() != null);
 
@@ -342,39 +333,7 @@ static string NewRecord(object hint, int recordsToSkip)
             }
 
             // Append the stack trace.
-            StackFrame[] array = new StackTrace().GetFrames();
-            if (array != null)
-            {
-                foreach (StackFrame e in array)
-                {
-                    if (recordsToSkip > 0)
-                    {
-                        recordsToSkip--;
-                    }
-                    else
-                    {
-                        string estr = e.ToString();
-
-                        // Strip the noisy stack trace elements.
-                        bool excluded = false;
-                        foreach (string exclusion in StackTraceElementExclusions)
-                        {
-                            if (estr.StartsWith(exclusion, StringComparison.InvariantCulture))
-                            {
-                                excluded = true;
-                                break;
-                            }
-                        }
-
-                        if (!excluded)
-                        {
-                            buf.Append('\t');
-                            buf.Append(estr);
-                            buf.Append(StringUtil.Newline);
-                        }
-                    }
-                }
-            }
+            buf.Append(Environment.StackTrace);
 
             return buf.ToString();
         }

src/DotNetty.Transport/Channels/ChannelException.cs

@@ -4,9 +4,7 @@
 namespace DotNetty.Transport.Channels
 {
     using System;
-    using System.Runtime.Serialization;
 
-    [Serializable]
     public class ChannelException : Exception
     {
         public ChannelException()
@@ -23,11 +21,6 @@ public ChannelException(string message, Exception innerException)
         {
         }
 
-        protected ChannelException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public ChannelException(Exception innerException)
             : base(null, innerException)
         {

src/DotNetty.Transport/Channels/ChannelHandlerInvokerUtil.cs

@@ -4,8 +4,6 @@
 namespace DotNetty.Transport.Channels
 {
     using System;
-    using System.Diagnostics;
-    using System.Linq.Expressions;
     using System.Net;
     using System.Threading.Tasks;
     using DotNetty.Common.Utilities;
@@ -242,32 +240,8 @@ static void NotifyHandlerException(IChannelHandlerContext ctx, Exception cause)
         static Task ComposeExceptionTask(Exception cause) => TaskEx.FromException(cause);
 
         // todo: use "nameof" once available
-        static readonly string ExceptionCaughtMethodName = ((MethodCallExpression)((Expression<Action<IChannelHandler>>)(_ => _.ExceptionCaught(null, null))).Body).Method.Name;
+        static readonly string ExceptionCaughtMethodName = nameof(IChannelHandler.ExceptionCaught);
 
-        static bool InExceptionCaught(Exception cause)
-        {
-            do
-            {
-                var trace = new StackTrace(cause);
-                for (int index = 0; index < trace.FrameCount; index++)
-                {
-                    StackFrame frame = trace.GetFrame(index);
-                    if (frame == null)
-                    {
-                        break;
-                    }
-
-                    if (ExceptionCaughtMethodName.Equals(frame.GetMethod().Name, StringComparison.Ordinal))
-                    {
-                        return true;
-                    }
-                }
-
-                cause = cause.InnerException;
-            }
-            while (cause != null);
-
-            return false;
-        }
+        static bool InExceptionCaught(Exception cause) => cause.StackTrace.IndexOf("." + ExceptionCaughtMethodName + "(", StringComparison.Ordinal) >= 0;
     }
 }

src/DotNetty.Transport/Channels/ChannelOutboundBuffer.cs

@@ -622,7 +622,7 @@ internal void Close(ClosedChannelException cause)
             this.ClearNioBuffers();
         }
 
-        public long TotalPendingWriteBytes() => Thread.VolatileRead(ref this.totalPendingSize);
+        public long TotalPendingWriteBytes() => Volatile.Read(ref this.totalPendingSize);
 
         /// <summary>
         ///     Call {@link IMessageProcessor#processMessage(Object)} for each flushed message

src/DotNetty.Transport/Channels/DefaultChannelConfiguration.cs

@@ -26,7 +26,7 @@ public class DefaultChannelConfiguration : IChannelConfiguration
         volatile int maxMessagesPerRead;
         volatile int writeBufferHighWaterMark = 64 * 1024;
         volatile int writeBufferLowWaterMark = 32 * 1024;
-        TimeSpan connectTimeout = DefaultConnectTimeout;
+        long connectTimeout = DefaultConnectTimeout.Ticks;
 
         protected readonly IChannel Channel;
 
@@ -150,17 +150,11 @@ protected virtual void Validate<T>(ChannelOption<T> option, T value)
 
         public TimeSpan ConnectTimeout
         {
-            get
-            {
-                TimeSpan result = this.connectTimeout;
-                Thread.MemoryBarrier();
-                return result;
-            }
+            get { return new TimeSpan(Volatile.Read(ref this.connectTimeout)); }
             set
             {
                 Contract.Requires(value >= TimeSpan.Zero);
-                Thread.MemoryBarrier();
-                this.connectTimeout = value;
+                Volatile.Write(ref this.connectTimeout, value.Ticks);
             }
         }