commit afe844bc95f8a0b2399315e618b636a6f32191dd
author csharptest <roger@csharptest.net> Fri Jun 10 16:03:22 2011 -0500
committer rogerk <devnull@localhost> Fri Jun 10 16:03:22 2011 -0500
tree 324e6b9a3c1c73622565548faa4e42a44642e24f
parent 2b86884659413efb1cbbcf7ebe22ef46a565b13d

Added the JsonFormatWriter/Reader

src/ProtoBench/Program.cs

diff --git a/src/ProtoBench/Program.cs b/src/ProtoBench/Program.cs
index 9de071f..2239fe0 100644
--- a/src/ProtoBench/Program.cs
+++ b/src/ProtoBench/Program.cs
@@ -39,6 +39,7 @@
 using System.Diagnostics;

 using System.IO;

 using System.Threading;

+using Google.ProtocolBuffers.Serialization;

 using Google.ProtocolBuffers.TestProtos;

 

 namespace Google.ProtocolBuffers.ProtoBench

@@ -127,12 +128,25 @@
                 inputData = inputData ?? File.ReadAllBytes(file);

                 MemoryStream inputStream = new MemoryStream(inputData);

                 ByteString inputString = ByteString.CopyFrom(inputData);

-                IMessage sampleMessage =

-                    defaultMessage.WeakCreateBuilderForType().WeakMergeFrom(inputString, registry).WeakBuild();

+                IMessage sampleMessage = defaultMessage.WeakCreateBuilderForType().WeakMergeFrom(inputString, registry).WeakBuild();

+                

+                StringWriter temp = new StringWriter();

+                new XmlFormatWriter(temp).WriteMessage(sampleMessage);

+                string xmlMessageText = temp.ToString();

+                temp = new StringWriter();

+                new JsonFormatWriter(temp).WriteMessage(sampleMessage);

+                string jsonMessageText = temp.ToString();

+

+                //Serializers

                 if(!FastTest) RunBenchmark("Serialize to byte string", inputData.Length, () => sampleMessage.ToByteString());

                 RunBenchmark("Serialize to byte array", inputData.Length, () => sampleMessage.ToByteArray());

                 if (!FastTest) RunBenchmark("Serialize to memory stream", inputData.Length,

                           () => sampleMessage.WriteTo(new MemoryStream()));

+

+                RunBenchmark("Serialize to xml", xmlMessageText.Length, () => new XmlFormatWriter(new StringWriter()).WriteMessage(sampleMessage));

+                RunBenchmark("Serialize to json", jsonMessageText.Length, () => new JsonFormatWriter(new StringWriter()).WriteMessage(sampleMessage));

+

+                //Deserializers

                 if (!FastTest) RunBenchmark("Deserialize from byte string", inputData.Length,

                           () => defaultMessage.WeakCreateBuilderForType()

                                     .WeakMergeFrom(inputString, registry)

@@ -151,6 +165,10 @@
                               CodedInputStream.CreateInstance(inputStream), registry)

                           .WeakBuild();

                   });

+

+                RunBenchmark("Deserialize from xml", xmlMessageText.Length, () => new XmlFormatReader(xmlMessageText).Merge(defaultMessage.WeakCreateBuilderForType()).WeakBuild());

+                RunBenchmark("Deserialize from json", jsonMessageText.Length, () => new JsonFormatReader(jsonMessageText).Merge(defaultMessage.WeakCreateBuilderForType()).WeakBuild());

+

                 Console.WriteLine();

                 return true;

             }