Improved deserialization performance when using classes.

Signed-off-by: rpgmaker <olamide.bakre@gmail.com>
rpgmaker · Nov 16, 2014 · c90e6e0 · c90e6e0
1 parent 96c30e8
commit c90e6e0
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 3 deletions.
diff --git a/NetJSON.v12.suo b/NetJSON.v12.suo
diff --git a/NetJSON/NetJSON.cs b/NetJSON/NetJSON.cs
@@ -3103,6 +3103,7 @@ private static MethodInfo GenerateGetClassOrDictFor(TypeBuilder typeBuilder, Typ
                 type, new[] { _charPtrType, _intType.MakeByRefType() });
             _readMethodBuilders[key] = method;
 
+
             var il = method.GetILGenerator();
 
             var dict = il.DeclareLocal(_dictType);
@@ -3293,6 +3294,71 @@ private static MethodInfo GenerateGetClassOrDictFor(TypeBuilder typeBuilder, Typ
                     il.Emit(OpCodes.Add);
                     il.Emit(OpCodes.Stloc, startIndex);
 
+
+                    //String Skipping Optimization
+                    var charCounts = new Dictionary<char, HashSet<int>>();
+
+                    var typeProps = type.GetTypeProperties();
+                    foreach (var prop in typeProps) {
+                        HashSet<int> charSet;
+                        var propName = prop.Name;
+                        char propChar = propName[0];
+                        if (!charCounts.TryGetValue(propChar, out charSet)) {
+                            charSet = charCounts[propChar] = new HashSet<int>();
+                        }
+                        charSet.Add(propName.Length);
+                    }
+
+                    var nextChar = il.DeclareLocal(_charType);
+                    var nextLabel = il.DefineLabel();
+
+                    il.Emit(OpCodes.Ldloc, ptr);
+                    il.Emit(OpCodes.Ldloc, startIndex);
+                    il.Emit(OpCodes.Ldc_I4_2);
+                    il.Emit(OpCodes.Mul);
+                    il.Emit(OpCodes.Conv_I);
+                    il.Emit(OpCodes.Add);
+                    il.Emit(OpCodes.Ldind_U2);
+                    il.Emit(OpCodes.Stloc, nextChar);
+
+                    foreach (var @char in charCounts) {
+                        var charKey = @char.Key;
+                        var hashSet = @char.Value;
+                        var checkChar = il.DefineLabel();
+
+
+                        il.Emit(OpCodes.Ldloc, nextChar);
+                        il.Emit(OpCodes.Ldc_I4, (int)charKey);
+                        il.Emit(OpCodes.Bne_Un, checkChar);
+
+
+                        foreach (var set in hashSet) {
+
+                            var checkCharByIndexLabel = il.DefineLabel();
+
+                            il.Emit(OpCodes.Ldloc, ptr);
+                            il.Emit(OpCodes.Ldloc, startIndex);
+                            il.Emit(OpCodes.Ldc_I4, set);
+                            il.Emit(OpCodes.Add);
+                            il.Emit(OpCodes.Ldc_I4_2);
+                            il.Emit(OpCodes.Mul);
+                            il.Emit(OpCodes.Conv_I);
+                            il.Emit(OpCodes.Add);
+                            il.Emit(OpCodes.Ldind_U2);
+                            il.Emit(OpCodes.Ldc_I4, (int)'"');
+                            il.Emit(OpCodes.Bne_Un, checkCharByIndexLabel);
+
+                            IncrementIndexRef(il, count: set);
+                            il.Emit(OpCodes.Br, nextLabel);
+
+                            il.MarkLabel(checkCharByIndexLabel);
+
+                        }
+
+                        il.MarkLabel(checkChar);
+                    }
+
+                    il.MarkLabel(nextLabel);
                     il.Emit(OpCodes.Br, currentQuotePrevNotLabel);
                     il.MarkLabel(currentQuoteLabel);
                     //else if(current == '"' && quotes > 0 && prev != '\\')

diff --git a/NetJSON/NetJSON.nuspec b/NetJSON/NetJSON.nuspec
@@ -4,7 +4,7 @@
     <id>NetJSON</id> 
     <title>NetJSON</title>
     <tags>json json-serializer javascript JSON serializer binary</tags>
-    <version>1.0.5.2</version> 
+    <version>1.0.5.3</version> 
     <authors>TJ Bakre</authors>
     <description>Faster than Any Binary?</description> 
     <language>en-US</language>

diff --git a/NetJSON/Properties/AssemblyInfo.cs b/NetJSON/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.2")]
-[assembly: AssemblyFileVersion("1.0.5.2")]
+[assembly: AssemblyVersion("1.0.5.3")]
+[assembly: AssemblyFileVersion("1.0.5.3")]
diff --git a/NetJSON/lib/net40/NetJSON.dll b/NetJSON/lib/net40/NetJSON.dll