improved PR to FullName usage.

RevenantX · RevenantX · commit be09f07f5df4 · 2018-01-13T14:14:06.000+02:00
diff --git a/LibSample/Program.cs b/LibSample/Program.cs
@@ -21,7 +21,7 @@ static void Main(string[] args)
             //new BroadcastTest().Run();
             //new BenchmarkTest.TestHost().Run();
             //new SerializerBenchmark().Run();
-            new SpeedBecnh().Run();
+            //new SpeedBecnh().Run();
         }
     }
 }
diff --git a/LiteNetLib/Utils/NetPacketProcessor.cs b/LiteNetLib/Utils/NetPacketProcessor.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace LiteNetLib.Utils
 {
@@ -16,7 +15,7 @@ public class NetPacketProcessor
         protected virtual ulong GetHash(Type type)
         {
             ulong hash;
-            string typeName = GetTypeName(type);
+            string typeName = type.FullName;
             if (_hashCache.TryGetValue(typeName, out hash))
             {
                 return hash;
@@ -48,15 +47,6 @@ protected virtual void WriteHash(Type type, NetDataWriter writer)
             writer.Put(GetHash(type));
         }
 
-        public static string GetTypeName(Type t)
-        {
-            if (!t.IsGenericType) return t.Name;
-
-            var genericTypes = t.GetGenericArguments();
-            var genericArguments = genericTypes.Aggregate("", (current, type) => current + type.Name);
-            return t.Name + genericArguments;
-        }
-
         /// <summary>
         /// Register nested property type
         /// </summary>
diff --git a/LiteNetLib/Utils/NetSerializer.cs b/LiteNetLib/Utils/NetSerializer.cs
@@ -177,8 +177,9 @@ private static Action<TClass, TProperty> ExtractSetDelegate<TClass, TProperty>(M
         private StructInfo RegisterInternal<T>()
         {
             Type t = typeof(T);
+            string typeName = t.FullName;
             StructInfo info;
-            if (_registeredTypes.TryGetValue(NetPacketProcessor.GetTypeName(t), out info))
+            if (_registeredTypes.TryGetValue(typeName, out info))
             {
                 return info;
             }
@@ -240,7 +241,7 @@ private StructInfo RegisterInternal<T>()
                     }
                     else
                     {
-                        throw new Exception("Not supported enum underlying type: " +NetPacketProcessor.GetTypeName(underlyingType));
+                        throw new Exception("Not supported enum underlying type: " + underlyingType.Name);
                     }
                 }
                 else if (propertyType == typeof(string))
@@ -470,11 +471,11 @@ private StructInfo RegisterInternal<T>()
                     }
                     else
                     {
-                        throw new Exception("Unknown property type: " +NetPacketProcessor.GetTypeName(propertyType));
+                        throw new Exception("Unknown property type: " + propertyType.FullName);
                     }
                 }
             }
-            _registeredTypes.Add(NetPacketProcessor.GetTypeName(t), info);
+            _registeredTypes.Add(typeName, info);
 
             return info;
         }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static void Main(string[] args)`
`21`	`21`	`//new BroadcastTest().Run();`
`22`	`22`	`//new BenchmarkTest.TestHost().Run();`
`23`	`23`	`//new SerializerBenchmark().Run();`
`24`		`- new SpeedBecnh().Run();`
	`24`	`+ //new SpeedBecnh().Run();`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,9 @@ private static Action<TClass, TProperty> ExtractSetDelegate<TClass, TProperty>(M`
`177`	`177`	`private StructInfo RegisterInternal<T>()`
`178`	`178`	`{`
`179`	`179`	`Type t = typeof(T);`
	`180`	`+ string typeName = t.FullName;`
`180`	`181`	`StructInfo info;`
`181`		`- if (_registeredTypes.TryGetValue(NetPacketProcessor.GetTypeName(t), out info))`
	`182`	`+ if (_registeredTypes.TryGetValue(typeName, out info))`
`182`	`183`	`{`
`183`	`184`	`return info;`
`184`	`185`	`}`
`@@ -240,7 +241,7 @@ private StructInfo RegisterInternal<T>()`
`240`	`241`	`}`
`241`	`242`	`else`
`242`	`243`	`{`
`243`		`- throw new Exception("Not supported enum underlying type: " +NetPacketProcessor.GetTypeName(underlyingType));`
	`244`	`+ throw new Exception("Not supported enum underlying type: " + underlyingType.Name);`
`244`	`245`	`}`
`245`	`246`	`}`
`246`	`247`	`else if (propertyType == typeof(string))`
`@@ -470,11 +471,11 @@ private StructInfo RegisterInternal<T>()`
`470`	`471`	`}`
`471`	`472`	`else`
`472`	`473`	`{`
`473`		`- throw new Exception("Unknown property type: " +NetPacketProcessor.GetTypeName(propertyType));`
	`474`	`+ throw new Exception("Unknown property type: " + propertyType.FullName);`
`474`	`475`	`}`
`475`	`476`	`}`
`476`	`477`	`}`
`477`		`- _registeredTypes.Add(NetPacketProcessor.GetTypeName(t), info);`
	`478`	`+ _registeredTypes.Add(typeName, info);`
`478`	`479`
`479`	`480`	`return info;`
`480`	`481`	`}`