-Reduced string allocations

This commit is contained in:
James Newton-King
2013-04-22 23:55:21 +12:00
parent c70eaaa004
commit 6d109a4c55
8 changed files with 176 additions and 79 deletions
@@ -1183,7 +1183,8 @@ _____'propertyName': NaN
Console.WriteLine("Position: " + (int)c); Console.WriteLine("Position: " + (int)c);
StringWriter swNew = new StringWriter(); StringWriter swNew = new StringWriter();
JavaScriptUtils.WriteEscapedJavaScriptString(swNew, c.ToString(), '"', true, JavaScriptUtils.DoubleQuoteCharEscapeFlags, StringEscapeHandling.Default); char[] buffer = null;
JavaScriptUtils.WriteEscapedJavaScriptString(swNew, c.ToString(), '"', true, JavaScriptUtils.DoubleQuoteCharEscapeFlags, StringEscapeHandling.Default, ref buffer);
StringWriter swOld = new StringWriter(); StringWriter swOld = new StringWriter();
WriteEscapedJavaScriptStringOld(swOld, c.ToString(), '"', true); WriteEscapedJavaScriptStringOld(swOld, c.ToString(), '"', true);
@@ -324,7 +324,8 @@ If attributes are not mentioned, default values are used in each case.
{ {
using (StringWriter w = StringUtils.CreateStringWriter(StringUtils.GetLength(text) ?? 16)) using (StringWriter w = StringUtils.CreateStringWriter(StringUtils.GetLength(text) ?? 16))
{ {
JavaScriptUtils.WriteEscapedJavaScriptString(w, text, '"', true, JavaScriptUtils.DoubleQuoteCharEscapeFlags, StringEscapeHandling.Default); char[] buffer = null;
JavaScriptUtils.WriteEscapedJavaScriptString(w, text, '"', true, JavaScriptUtils.DoubleQuoteCharEscapeFlags, StringEscapeHandling.Default, ref buffer);
} }
} }
@@ -75,4 +75,4 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("5.0.4.16021")] [assembly: AssemblyFileVersion("5.0.4.16022")]
+22 -15
View File
@@ -648,6 +648,11 @@ namespace Newtonsoft.Json
if (ReadData(true) == 0) if (ReadData(true) == 0)
return; return;
} }
else
{
_charPos = charPos - 1;
return;
}
break; break;
case '-': case '-':
case '+': case '+':
@@ -1187,7 +1192,7 @@ namespace Newtonsoft.Json
} }
else else
{ {
numberValue = ConvertUtils.IntParseFast(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length); numberValue = ConvertUtils.Int32Parse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length);
} }
numberType = JsonToken.Integer; numberType = JsonToken.Integer;
@@ -1237,12 +1242,18 @@ namespace Newtonsoft.Json
numberType = JsonToken.Integer; numberType = JsonToken.Integer;
} }
else else
{
long value;
ParseResult parseResult = ConvertUtils.Int64TryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out value);
if (parseResult == ParseResult.Success)
{
numberValue = value;
numberType = JsonToken.Integer;
}
else if (parseResult == ParseResult.Invalid)
{ {
string number = _stringReference.ToString(); string number = _stringReference.ToString();
// it's faster to do 3 indexof with single characters than an indexofany
if (number.IndexOf('.') != -1 || number.IndexOf('E') != -1 || number.IndexOf('e') != -1)
{
if (_floatParseHandling == FloatParseHandling.Decimal) if (_floatParseHandling == FloatParseHandling.Decimal)
numberValue = decimal.Parse(number, NumberStyles.Number | NumberStyles.AllowExponent, CultureInfo.InvariantCulture); numberValue = decimal.Parse(number, NumberStyles.Number | NumberStyles.AllowExponent, CultureInfo.InvariantCulture);
else else
@@ -1250,24 +1261,20 @@ namespace Newtonsoft.Json
numberType = JsonToken.Float; numberType = JsonToken.Float;
} }
else else if (parseResult == ParseResult.Overflow)
{
long value;
if (long.TryParse(number, out value))
{
numberValue = value;
}
else
{ {
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE) #if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
string number = _stringReference.ToString();
numberValue = BigInteger.Parse(number, CultureInfo.InvariantCulture); numberValue = BigInteger.Parse(number, CultureInfo.InvariantCulture);
numberType = JsonToken.Integer;
#else #else
// todo - validate number was a valid integer to make sure overflow was the reason for failure // todo - validate number was a valid integer to make sure overflow was the reason for failure
throw JsonReaderException.Create(this, "JSON integer {0} is too large or small for an Int64.".FormatWith(CultureInfo.InvariantCulture, number)); throw JsonReaderException.Create(this, "JSON integer {0} is too large or small for an Int64.".FormatWith(CultureInfo.InvariantCulture, _stringReference.ToString()));
#endif #endif
} }
else
numberType = JsonToken.Integer; {
throw JsonReaderException.Create(this, "Unknown error parsing integer.");
} }
} }
} }
+9 -3
View File
@@ -214,7 +214,7 @@ namespace Newtonsoft.Json
{ {
InternalWritePropertyName(name); InternalWritePropertyName(name);
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, name, _quoteChar, _quoteName, _charEscapeFlags, StringEscapeHandling); WriteEscapedString(name);
_writer.Write(':'); _writer.Write(':');
} }
@@ -230,7 +230,7 @@ namespace Newtonsoft.Json
if (escape) if (escape)
{ {
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, name, _quoteChar, _quoteName, _charEscapeFlags, StringEscapeHandling); WriteEscapedString(name);
} }
else else
{ {
@@ -364,7 +364,13 @@ namespace Newtonsoft.Json
if (value == null) if (value == null)
WriteValueInternal(JsonConvert.Null, JsonToken.Null); WriteValueInternal(JsonConvert.Null, JsonToken.Null);
else else
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true, _charEscapeFlags, StringEscapeHandling); WriteEscapedString(value);
}
private void WriteEscapedString(string value)
{
EnsureWriteBuffer();
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true, _charEscapeFlags, StringEscapeHandling, ref _writeBuffer);
} }
/// <summary> /// <summary>
@@ -92,6 +92,6 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("5.0.4.16021")] [assembly: AssemblyFileVersion("5.0.4.16022")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
+69 -7
View File
@@ -98,6 +98,14 @@ namespace Newtonsoft.Json.Utilities
public PrimitiveTypeCode TypeCode { get; set; } public PrimitiveTypeCode TypeCode { get; set; }
} }
internal enum ParseResult
{
None,
Success,
Overflow,
Invalid
}
internal static class ConvertUtils internal static class ConvertUtils
{ {
private static readonly Dictionary<Type, PrimitiveTypeCode> TypeCodeMap = private static readonly Dictionary<Type, PrimitiveTypeCode> TypeCodeMap =
@@ -337,6 +345,7 @@ namespace Newtonsoft.Json.Utilities
#endif #endif
#region Convert #region Convert
/// <summary> /// <summary>
/// Converts the value to the specified type. /// Converts the value to the specified type.
/// </summary> /// </summary>
@@ -446,6 +455,7 @@ namespace Newtonsoft.Json.Utilities
#endregion #endregion
#region TryConvert #region TryConvert
/// <summary> /// <summary>
/// Converts the value to the specified type. /// Converts the value to the specified type.
/// </summary> /// </summary>
@@ -469,9 +479,11 @@ namespace Newtonsoft.Json.Utilities
return false; return false;
} }
} }
#endregion #endregion
#region ConvertOrCast #region ConvertOrCast
/// <summary> /// <summary>
/// Converts the value to the specified type. If the value is unable to be converted, the /// Converts the value to the specified type. If the value is unable to be converted, the
/// value is checked whether it assignable to the specified type. /// value is checked whether it assignable to the specified type.
@@ -498,6 +510,7 @@ namespace Newtonsoft.Json.Utilities
return EnsureTypeAssignable(initialValue, ReflectionUtils.GetObjectType(initialValue), targetType); return EnsureTypeAssignable(initialValue, ReflectionUtils.GetObjectType(initialValue), targetType);
} }
#endregion #endregion
private static object EnsureTypeAssignable(object value, Type initialType, Type targetType) private static object EnsureTypeAssignable(object value, Type initialType, Type targetType)
@@ -567,12 +580,12 @@ namespace Newtonsoft.Json.Utilities
} }
} }
public static int IntParseFast(char[] value, int start, int length) public static int Int32Parse(char[] chars, int start, int length)
{ {
if (length == 0) if (length == 0)
throw new FormatException("Input string was not in a correct format."); throw new FormatException("Input string was not in a correct format.");
bool isNegative = (value[start] == '-'); bool isNegative = (chars[start] == '-');
if (isNegative) if (isNegative)
{ {
@@ -584,18 +597,23 @@ namespace Newtonsoft.Json.Utilities
length--; length--;
} }
checked
{
int result = 0; int result = 0;
int end = start + length; int end = start + length;
for (int i = start; i < end; i++) for (int i = start; i < end; i++)
{ {
char c = value[i]; int c = chars[i] - '0';
if (c < '0' || c > '9') if (c < 0 || c > 9)
throw new FormatException("Input string was not in a correct format."); throw new FormatException("Input string was not in a correct format.");
result = 10*result + -(c - 48); int newValue = (10*result) - c;
// overflow has caused the number to loop around
if (newValue > result)
throw new OverflowException();
result = newValue;
} }
// go from negative to positive to avoids overflow // go from negative to positive to avoids overflow
@@ -605,6 +623,50 @@ namespace Newtonsoft.Json.Utilities
return result; return result;
} }
public static ParseResult Int64TryParse(char[] chars, int start, int length, out long value)
{
value = 0;
if (length == 0)
return ParseResult.Invalid;
bool isNegative = (chars[start] == '-');
if (isNegative)
{
// text just a negative sign
if (length == 1)
return ParseResult.Invalid;
start++;
length--;
}
int end = start + length;
for (int i = start; i < end; i++)
{
int c = chars[i] - '0';
if (c < 0 || c > 9)
return ParseResult.Invalid;
long newValue = (10*value) - c;
// overflow has caused the number to loop around
if (newValue > value)
return ParseResult.Overflow;
value = newValue;
}
// go from negative to positive to avoids overflow
// negative can be slightly bigger than positive
if (!isNegative)
value = -value;
return ParseResult.Success;
} }
} }
} }
@@ -71,7 +71,8 @@ namespace Newtonsoft.Json.Utilities
private const string EscapedUnicodeText = "!"; private const string EscapedUnicodeText = "!";
public static void WriteEscapedJavaScriptString(TextWriter writer, string s, char delimiter, bool appendDelimiters, bool[] charEscapeFlags, StringEscapeHandling stringEscapeHandling) public static void WriteEscapedJavaScriptString(TextWriter writer, string s, char delimiter, bool appendDelimiters,
bool[] charEscapeFlags, StringEscapeHandling stringEscapeHandling, ref char[] writeBuffer)
{ {
// leading delimiter // leading delimiter
if (appendDelimiters) if (appendDelimiters)
@@ -79,8 +80,6 @@ namespace Newtonsoft.Json.Utilities
if (s != null) if (s != null)
{ {
char[] chars = null;
char[] unicodeBuffer = null;
int lastWritePosition = 0; int lastWritePosition = 0;
for (int i = 0; i < s.Length; i++) for (int i = 0; i < s.Length; i++)
@@ -134,10 +133,10 @@ namespace Newtonsoft.Json.Utilities
} }
else else
{ {
if (unicodeBuffer == null) if (writeBuffer == null)
unicodeBuffer = new char[6]; writeBuffer = new char[6];
StringUtils.ToCharAsUnicode(c, unicodeBuffer); StringUtils.ToCharAsUnicode(c, writeBuffer);
// slightly hacky but it saves multiple conditions in if test // slightly hacky but it saves multiple conditions in if test
escapedValue = EscapedUnicodeText; escapedValue = EscapedUnicodeText;
@@ -153,20 +152,36 @@ namespace Newtonsoft.Json.Utilities
if (escapedValue == null) if (escapedValue == null)
continue; continue;
bool isEscapedUnicodeText = string.Equals(escapedValue, EscapedUnicodeText);
if (i > lastWritePosition) if (i > lastWritePosition)
{ {
if (chars == null) int length = i - lastWritePosition + ((isEscapedUnicodeText) ? 6 : 0);
chars = s.ToCharArray(); int start = (isEscapedUnicodeText) ? 6 : 0;
if (writeBuffer == null || writeBuffer.Length < length)
{
char[] newBuffer = new char[length];
// the unicode text is already in the buffer
// copy it over when creating new buffer
if (isEscapedUnicodeText)
Array.Copy(writeBuffer, newBuffer, 6);
writeBuffer = newBuffer;
}
s.CopyTo(lastWritePosition, writeBuffer, start, length - start);
// write unchanged chars before writing escaped text // write unchanged chars before writing escaped text
writer.Write(chars, lastWritePosition, i - lastWritePosition); writer.Write(writeBuffer, start, length - start);
} }
lastWritePosition = i + 1; lastWritePosition = i + 1;
if (!string.Equals(escapedValue, EscapedUnicodeText)) if (!isEscapedUnicodeText)
writer.Write(escapedValue); writer.Write(escapedValue);
else else
writer.Write(unicodeBuffer); writer.Write(writeBuffer, 0, 6);
} }
if (lastWritePosition == 0) if (lastWritePosition == 0)
@@ -176,11 +191,15 @@ namespace Newtonsoft.Json.Utilities
} }
else else
{ {
if (chars == null) int length = s.Length - lastWritePosition;
chars = s.ToCharArray();
if (writeBuffer == null || writeBuffer.Length < length)
writeBuffer = new char[length];
s.CopyTo(lastWritePosition, writeBuffer, 0, length);
// write remaining text // write remaining text
writer.Write(chars, lastWritePosition, s.Length - lastWritePosition); writer.Write(writeBuffer, 0, length);
} }
} }
@@ -193,7 +212,8 @@ namespace Newtonsoft.Json.Utilities
{ {
using (StringWriter w = StringUtils.CreateStringWriter(StringUtils.GetLength(value) ?? 16)) using (StringWriter w = StringUtils.CreateStringWriter(StringUtils.GetLength(value) ?? 16))
{ {
WriteEscapedJavaScriptString(w, value, delimiter, appendDelimiters, (delimiter == '"') ? DoubleQuoteCharEscapeFlags : SingleQuoteCharEscapeFlags, StringEscapeHandling.Default); char[] buffer = null;
WriteEscapedJavaScriptString(w, value, delimiter, appendDelimiters, (delimiter == '"') ? DoubleQuoteCharEscapeFlags : SingleQuoteCharEscapeFlags, StringEscapeHandling.Default, ref buffer);
return w.ToString(); return w.ToString();
} }
} }