Asynchronous methods in readers and writers. (#1122)
Contributes to #650
This commit is contained in:
committed by
James Newton-King
parent
211b3b0db2
commit
f663060005
@@ -43,6 +43,7 @@ using Newtonsoft.Json.Bson;
|
||||
using System.Runtime.Serialization.Formatters.Binary;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
@@ -69,8 +70,8 @@ namespace Newtonsoft.Json.Tests
|
||||
#if DEBUG
|
||||
public int Iterations = 1;
|
||||
#else
|
||||
public int Iterations = 100;
|
||||
//public int Iterations = 10000;
|
||||
//public int Iterations = 100;
|
||||
public int Iterations = 10000;
|
||||
#endif
|
||||
|
||||
#region Data
|
||||
@@ -99,6 +100,7 @@ namespace Newtonsoft.Json.Tests
|
||||
JsonNetBinary,
|
||||
JsonNetLinq,
|
||||
JsonNetManual,
|
||||
JsonNetManualAsync,
|
||||
BinaryFormatter,
|
||||
JavaScriptSerializer,
|
||||
DataContractSerializer,
|
||||
@@ -136,6 +138,14 @@ namespace Newtonsoft.Json.Tests
|
||||
SerializeTests(test);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task SerializeAsync()
|
||||
{
|
||||
TestClass test = CreateSerializationObject();
|
||||
|
||||
await BenchmarkSerializeMethodAsync(SerializeMethod.JsonNetManualAsync, test);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadLargeJson()
|
||||
{
|
||||
@@ -238,6 +248,12 @@ namespace Newtonsoft.Json.Tests
|
||||
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.JsonNetBinary, HexToBytes(BsonHex));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task DeserializeAsync()
|
||||
{
|
||||
await BenchmarkDeserializeMethodAsync<TestClass>(SerializeMethod.JsonNetManualAsync, JsonText);
|
||||
}
|
||||
|
||||
public void DeserializeTests<T>(string json)
|
||||
{
|
||||
BenchmarkDeserializeMethod<T>(SerializeMethod.JavaScriptSerializer, json);
|
||||
@@ -641,6 +657,27 @@ If attributes are not mentioned, default values are used in each case.
|
||||
#region Serialize
|
||||
private static readonly byte[] Buffer = new byte[4096];
|
||||
|
||||
public async Task BenchmarkSerializeMethodAsync(SerializeMethod method, object value)
|
||||
{
|
||||
await SerializeAsync(method, value);
|
||||
|
||||
Stopwatch timed = new Stopwatch();
|
||||
timed.Start();
|
||||
|
||||
string json = null;
|
||||
for (int x = 0; x < Iterations; x++)
|
||||
{
|
||||
json = await SerializeAsync(method, value);
|
||||
}
|
||||
|
||||
timed.Stop();
|
||||
|
||||
Console.WriteLine("Serialize method: {0}", method);
|
||||
Console.WriteLine("{0} ms", timed.ElapsedMilliseconds);
|
||||
Console.WriteLine(json);
|
||||
Console.WriteLine();
|
||||
}
|
||||
|
||||
public void BenchmarkSerializeMethod(SerializeMethod method, object value)
|
||||
{
|
||||
Serialize(method, value);
|
||||
@@ -738,6 +775,83 @@ If attributes are not mentioned, default values are used in each case.
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<string> SerializeAsync(SerializeMethod method, object value)
|
||||
{
|
||||
string json;
|
||||
|
||||
switch (method)
|
||||
{
|
||||
case SerializeMethod.JsonNetManualAsync:
|
||||
{
|
||||
TestClass c = value as TestClass;
|
||||
if (c != null)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonTextWriter writer = new JsonTextWriter(sw);
|
||||
await writer.WriteStartObjectAsync();
|
||||
await writer.WritePropertyNameAsync("strings");
|
||||
await writer.WriteStartArrayAsync();
|
||||
foreach (string s in c.strings)
|
||||
{
|
||||
await writer.WriteValueAsync(s);
|
||||
}
|
||||
await writer.WriteEndArrayAsync();
|
||||
await writer.WritePropertyNameAsync("dictionary");
|
||||
await writer.WriteStartObjectAsync();
|
||||
foreach (KeyValuePair<string, int> keyValuePair in c.dictionary)
|
||||
{
|
||||
await writer.WritePropertyNameAsync(keyValuePair.Key);
|
||||
await writer.WriteValueAsync(keyValuePair.Value);
|
||||
}
|
||||
await writer.WriteEndObjectAsync();
|
||||
await writer.WritePropertyNameAsync("Name");
|
||||
await writer.WriteValueAsync(c.Name);
|
||||
await writer.WritePropertyNameAsync("Now");
|
||||
await writer.WriteValueAsync(c.Now);
|
||||
await writer.WritePropertyNameAsync("BigNumber");
|
||||
await writer.WriteValueAsync(c.BigNumber);
|
||||
await writer.WritePropertyNameAsync("Address1");
|
||||
await writer.WriteStartObjectAsync();
|
||||
await writer.WritePropertyNameAsync("Street");
|
||||
await writer.WriteValueAsync(c.BigNumber);
|
||||
await writer.WritePropertyNameAsync("Street");
|
||||
await writer.WriteValueAsync(c.BigNumber);
|
||||
await writer.WritePropertyNameAsync("Street");
|
||||
await writer.WriteValueAsync(c.BigNumber);
|
||||
await writer.WriteEndObjectAsync();
|
||||
await writer.WritePropertyNameAsync("Addresses");
|
||||
await writer.WriteStartArrayAsync();
|
||||
foreach (Address address in c.Addresses)
|
||||
{
|
||||
await writer.WriteStartObjectAsync();
|
||||
await writer.WritePropertyNameAsync("Street");
|
||||
await writer.WriteValueAsync(address.Street);
|
||||
await writer.WritePropertyNameAsync("Phone");
|
||||
await writer.WriteValueAsync(address.Phone);
|
||||
await writer.WritePropertyNameAsync("Entered");
|
||||
await writer.WriteValueAsync(address.Entered);
|
||||
await writer.WriteEndObjectAsync();
|
||||
}
|
||||
await writer.WriteEndArrayAsync();
|
||||
await writer.WriteEndObjectAsync();
|
||||
|
||||
await writer.FlushAsync();
|
||||
json = sw.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
json = string.Empty;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
json = string.Empty;
|
||||
break;
|
||||
}
|
||||
|
||||
return json;
|
||||
}
|
||||
|
||||
private string Serialize(SerializeMethod method, object value)
|
||||
{
|
||||
string json;
|
||||
@@ -751,111 +865,111 @@ If attributes are not mentioned, default values are used in each case.
|
||||
json = JsonConvert.SerializeObject(value, new IsoDateTimeConverter());
|
||||
break;
|
||||
case SerializeMethod.JsonNetLinq:
|
||||
{
|
||||
TestClass c = value as TestClass;
|
||||
if (c != null)
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("strings", new JArray(
|
||||
c.strings
|
||||
)),
|
||||
new JProperty("dictionary", new JObject(c.dictionary.Select(d => new JProperty(d.Key, d.Value)))),
|
||||
new JProperty("Name", c.Name),
|
||||
new JProperty("Now", c.Now),
|
||||
new JProperty("BigNumber", c.BigNumber),
|
||||
new JProperty("Address1", new JObject(
|
||||
new JProperty("Street", c.Address1.Street),
|
||||
new JProperty("Phone", c.Address1.Phone),
|
||||
new JProperty("Entered", c.Address1.Entered))),
|
||||
new JProperty("Addresses", new JArray(c.Addresses.Select(a =>
|
||||
new JObject(
|
||||
new JProperty("Street", a.Street),
|
||||
new JProperty("Phone", a.Phone),
|
||||
new JProperty("Entered", a.Entered)))))
|
||||
);
|
||||
TestClass c = value as TestClass;
|
||||
if (c != null)
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("strings", new JArray(
|
||||
c.strings
|
||||
)),
|
||||
new JProperty("dictionary", new JObject(c.dictionary.Select(d => new JProperty(d.Key, d.Value)))),
|
||||
new JProperty("Name", c.Name),
|
||||
new JProperty("Now", c.Now),
|
||||
new JProperty("BigNumber", c.BigNumber),
|
||||
new JProperty("Address1", new JObject(
|
||||
new JProperty("Street", c.Address1.Street),
|
||||
new JProperty("Phone", c.Address1.Phone),
|
||||
new JProperty("Entered", c.Address1.Entered))),
|
||||
new JProperty("Addresses", new JArray(c.Addresses.Select(a =>
|
||||
new JObject(
|
||||
new JProperty("Street", a.Street),
|
||||
new JProperty("Phone", a.Phone),
|
||||
new JProperty("Entered", a.Entered)))))
|
||||
);
|
||||
|
||||
json = o.ToString(Formatting.None);
|
||||
json = o.ToString(Formatting.None);
|
||||
}
|
||||
else
|
||||
{
|
||||
json = string.Empty;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
json = string.Empty;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SerializeMethod.JsonNetManual:
|
||||
{
|
||||
TestClass c = value as TestClass;
|
||||
if (c != null)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonTextWriter writer = new JsonTextWriter(sw);
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("strings");
|
||||
writer.WriteStartArray();
|
||||
foreach (string s in c.strings)
|
||||
{
|
||||
writer.WriteValue(s);
|
||||
}
|
||||
writer.WriteEndArray();
|
||||
writer.WritePropertyName("dictionary");
|
||||
writer.WriteStartObject();
|
||||
foreach (KeyValuePair<string, int> keyValuePair in c.dictionary)
|
||||
{
|
||||
writer.WritePropertyName(keyValuePair.Key);
|
||||
writer.WriteValue(keyValuePair.Value);
|
||||
}
|
||||
writer.WriteEndObject();
|
||||
writer.WritePropertyName("Name");
|
||||
writer.WriteValue(c.Name);
|
||||
writer.WritePropertyName("Now");
|
||||
writer.WriteValue(c.Now);
|
||||
writer.WritePropertyName("BigNumber");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Address1");
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WriteEndObject();
|
||||
writer.WritePropertyName("Addresses");
|
||||
writer.WriteStartArray();
|
||||
foreach (Address address in c.Addresses)
|
||||
TestClass c = value as TestClass;
|
||||
if (c != null)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonTextWriter writer = new JsonTextWriter(sw);
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("strings");
|
||||
writer.WriteStartArray();
|
||||
foreach (string s in c.strings)
|
||||
{
|
||||
writer.WriteValue(s);
|
||||
}
|
||||
writer.WriteEndArray();
|
||||
writer.WritePropertyName("dictionary");
|
||||
writer.WriteStartObject();
|
||||
foreach (KeyValuePair<string, int> keyValuePair in c.dictionary)
|
||||
{
|
||||
writer.WritePropertyName(keyValuePair.Key);
|
||||
writer.WriteValue(keyValuePair.Value);
|
||||
}
|
||||
writer.WriteEndObject();
|
||||
writer.WritePropertyName("Name");
|
||||
writer.WriteValue(c.Name);
|
||||
writer.WritePropertyName("Now");
|
||||
writer.WriteValue(c.Now);
|
||||
writer.WritePropertyName("BigNumber");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Address1");
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(address.Street);
|
||||
writer.WritePropertyName("Phone");
|
||||
writer.WriteValue(address.Phone);
|
||||
writer.WritePropertyName("Entered");
|
||||
writer.WriteValue(address.Entered);
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(c.BigNumber);
|
||||
writer.WriteEndObject();
|
||||
writer.WritePropertyName("Addresses");
|
||||
writer.WriteStartArray();
|
||||
foreach (Address address in c.Addresses)
|
||||
{
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("Street");
|
||||
writer.WriteValue(address.Street);
|
||||
writer.WritePropertyName("Phone");
|
||||
writer.WriteValue(address.Phone);
|
||||
writer.WritePropertyName("Entered");
|
||||
writer.WriteValue(address.Entered);
|
||||
writer.WriteEndObject();
|
||||
}
|
||||
writer.WriteEndArray();
|
||||
writer.WriteEndObject();
|
||||
|
||||
writer.Flush();
|
||||
json = sw.ToString();
|
||||
}
|
||||
writer.WriteEndArray();
|
||||
writer.WriteEndObject();
|
||||
|
||||
writer.Flush();
|
||||
json = sw.ToString();
|
||||
else
|
||||
{
|
||||
json = string.Empty;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
json = string.Empty;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SerializeMethod.JsonNetBinary:
|
||||
{
|
||||
MemoryStream ms = new MemoryStream(Buffer);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
serializer.Serialize(writer, value);
|
||||
{
|
||||
MemoryStream ms = new MemoryStream(Buffer);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
serializer.Serialize(writer, value);
|
||||
|
||||
//json = BitConverter.ToString(ms.ToArray(), 0, (int)ms.Position);
|
||||
json = "Bytes = " + ms.Position;
|
||||
break;
|
||||
}
|
||||
//json = BitConverter.ToString(ms.ToArray(), 0, (int)ms.Position);
|
||||
json = "Bytes = " + ms.Position;
|
||||
break;
|
||||
}
|
||||
case SerializeMethod.JavaScriptSerializer:
|
||||
json = SerializeWebExtensions(value);
|
||||
break;
|
||||
@@ -918,6 +1032,35 @@ If attributes are not mentioned, default values are used in each case.
|
||||
Console.WriteLine();
|
||||
}
|
||||
|
||||
public async Task BenchmarkDeserializeMethodAsync<T>(SerializeMethod method, object json, int? iterations = null, bool warmUp = true)
|
||||
{
|
||||
GC.Collect();
|
||||
GC.WaitForPendingFinalizers();
|
||||
|
||||
if (warmUp)
|
||||
{
|
||||
await DeserializeAsync<T>(method, json);
|
||||
}
|
||||
|
||||
Stopwatch timed = new Stopwatch();
|
||||
timed.Start();
|
||||
|
||||
iterations = iterations ?? Iterations;
|
||||
|
||||
T value = default(T);
|
||||
for (int x = 0; x < iterations.Value; x++)
|
||||
{
|
||||
value = await DeserializeAsync<T>(method, json);
|
||||
}
|
||||
|
||||
timed.Stop();
|
||||
|
||||
Console.WriteLine("Deserialize method: {0}", method);
|
||||
Console.WriteLine("{0} ms", timed.ElapsedMilliseconds);
|
||||
Console.WriteLine(value);
|
||||
Console.WriteLine();
|
||||
}
|
||||
|
||||
public T DeserializeJsonNet<T>(string json, bool isoDateTimeConverter)
|
||||
{
|
||||
Type type = typeof(T);
|
||||
@@ -940,6 +1083,66 @@ If attributes are not mentioned, default values are used in each case.
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<TestClass> DeserializeJsonNetManualAsync(string json)
|
||||
{
|
||||
TestClass c = new TestClass();
|
||||
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||
await reader.ReadAsync();
|
||||
while (await reader.ReadAsync())
|
||||
{
|
||||
if (reader.TokenType == JsonToken.PropertyName)
|
||||
{
|
||||
string propertyName = (string)reader.Value;
|
||||
switch (propertyName)
|
||||
{
|
||||
case "strings":
|
||||
await reader.ReadAsync();
|
||||
while (await reader.ReadAsync() && reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
c.strings.Add((string)reader.Value);
|
||||
}
|
||||
break;
|
||||
case "dictionary":
|
||||
await reader.ReadAsync();
|
||||
while (await reader.ReadAsync() && reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
string key = (string)reader.Value;
|
||||
c.dictionary.Add(key, reader.ReadAsInt32().GetValueOrDefault());
|
||||
}
|
||||
break;
|
||||
case "Name":
|
||||
c.Name = reader.ReadAsString();
|
||||
break;
|
||||
case "Now":
|
||||
c.Now = reader.ReadAsDateTime().GetValueOrDefault();
|
||||
break;
|
||||
case "BigNumber":
|
||||
c.BigNumber = reader.ReadAsDecimal().GetValueOrDefault();
|
||||
break;
|
||||
case "Address1":
|
||||
await reader.ReadAsync();
|
||||
c.Address1 = CreateAddress(reader);
|
||||
break;
|
||||
case "Addresses":
|
||||
await reader.ReadAsync();
|
||||
while (await reader.ReadAsync() && reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
var address = CreateAddress(reader);
|
||||
c.Addresses.Add(address);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
public TestClass DeserializeJsonNetManual(string json)
|
||||
{
|
||||
TestClass c = new TestClass();
|
||||
@@ -1056,6 +1259,22 @@ If attributes are not mentioned, default values are used in each case.
|
||||
return (T)dataContractSerializer.ReadObject(ms);
|
||||
}
|
||||
|
||||
private async Task<T> DeserializeAsync<T>(SerializeMethod method, object json)
|
||||
{
|
||||
switch (method)
|
||||
{
|
||||
case SerializeMethod.JsonNetManualAsync:
|
||||
if (typeof(T) == typeof(TestClass))
|
||||
{
|
||||
return (T)(object)await DeserializeJsonNetManualAsync((string)json);
|
||||
}
|
||||
|
||||
return default(T);
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof(method));
|
||||
}
|
||||
}
|
||||
|
||||
private T Deserialize<T>(SerializeMethod method, object json)
|
||||
{
|
||||
switch (method)
|
||||
|
||||
Reference in New Issue
Block a user