Skip to content

R
rapidjson
Commit 0bce2ded authored by Milo Yip's avatar Milo Yip
Browse files
Options

Merge pull request #42 from pah/cleanup/streamcopy 

GenericReader: simplify local stream copy optimization
parents ebbfaf1c 7890a1b1
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 78 deletions
include/rapidjson/rapidjson.h
View file @ 0bce2ded
...@@ -209,38 +209,6 @@ struct StreamTraits { ...@@ -209,38 +209,6 @@ struct StreamTraits {
enum { copyOptimization = 0 }; enum { copyOptimization = 0 };
}; };
template<typename Stream, bool>
class StreamLocalCopy;
template<typename Stream>
class StreamLocalCopy<Stream, 1> {
public:
StreamLocalCopy(Stream& original) : original_(original), s_(original) {}
~StreamLocalCopy() { original_ = s_; }
Stream* operator->() { return &s_; }
Stream& operator*() { return s_; }
private:
StreamLocalCopy& operator=(const StreamLocalCopy&);
Stream& original_;
Stream s_;
};
template<typename Stream>
class StreamLocalCopy<Stream, 0> {
public:
StreamLocalCopy(Stream& original) : s_(original) {}
~StreamLocalCopy() {}
Stream* operator->() { return &s_; }
Stream& operator*() { return s_; }
private:
StreamLocalCopy& operator=(const StreamLocalCopy&);
Stream& s_;
};
//! Put N copies of a character to a stream. //! Put N copies of a character to a stream.
template<typename Stream, typename Ch> template<typename Stream, typename Ch>
inline void PutN(Stream& stream, Ch c, size_t n) { inline void PutN(Stream& stream, Ch c, size_t n) {
......
include/rapidjson/reader.h
View file @ 0bce2ded
...@@ -126,6 +126,43 @@ struct BaseReaderHandler { ...@@ -126,6 +126,43 @@ struct BaseReaderHandler {
void EndArray(SizeType) { Default(); } void EndArray(SizeType) { Default(); }
}; };
///////////////////////////////////////////////////////////////////////////////
// StreamLocalCopy
namespace internal {
template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
class StreamLocalCopy;
//! Do copy optimziation.
template<typename Stream>
class StreamLocalCopy<Stream, 1> {
public:
StreamLocalCopy(Stream& original) : s(original), original_(original) {}
~StreamLocalCopy() { original_ = s; }
Stream s;
private:
StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
Stream& original_;
};
//! Keep reference.
template<typename Stream>
class StreamLocalCopy<Stream, 0> {
public:
StreamLocalCopy(Stream& original) : s(original) {}
Stream& s;
private:
StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
};
} // namespace internal
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// SkipWhitespace // SkipWhitespace
...@@ -135,9 +172,11 @@ struct BaseReaderHandler { ...@@ -135,9 +172,11 @@ struct BaseReaderHandler {
*/ */
template<typename InputStream> template<typename InputStream>
void SkipWhitespace(InputStream& is) { void SkipWhitespace(InputStream& is) {
StreamLocalCopy<InputStream, StreamTraits<InputStream>::copyOptimization> s(is); internal::StreamLocalCopy<InputStream> copy(is);
while (s->Peek() == ' ' || s->Peek() == '\n' || s->Peek() == '\r' || s->Peek() == '\t') InputStream& s(copy.s);
s->Take();
while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
s.Take();
} }
#ifdef RAPIDJSON_SSE42 #ifdef RAPIDJSON_SSE42
...@@ -448,19 +487,21 @@ private: ...@@ -448,19 +487,21 @@ private:
// Parse string and generate String event. Different code paths for kParseInsituFlag. // Parse string and generate String event. Different code paths for kParseInsituFlag.
template<unsigned parseFlags, typename InputStream, typename Handler> template<unsigned parseFlags, typename InputStream, typename Handler>
void ParseString(InputStream& is, Handler& handler) { void ParseString(InputStream& is, Handler& handler) {
StreamLocalCopy<InputStream, StreamTraits<InputStream>::copyOptimization> s(is); internal::StreamLocalCopy<InputStream> copy(is);
InputStream& s(copy.s);
if (parseFlags & kParseInsituFlag) { if (parseFlags & kParseInsituFlag) {
Ch *head = s->PutBegin(); Ch *head = s.PutBegin();
ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(*s, *s); ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
if (HasParseError()) if (HasParseError())
return; return;
size_t length = s->PutEnd(head) - 1; size_t length = s.PutEnd(head) - 1;
RAPIDJSON_ASSERT(length <= 0xFFFFFFFF); RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
handler.String((typename TargetEncoding::Ch*)head, SizeType(length), false); handler.String((typename TargetEncoding::Ch*)head, SizeType(length), false);
} }
else { else {
StackStream stackStream(stack_); StackStream stackStream(stack_);
ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(*s, stackStream); ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
if (HasParseError()) if (HasParseError())
return; return;
handler.String(stack_.template Pop<typename TargetEncoding::Ch>(stackStream.length_), stackStream.length_ - 1, true); handler.String(stack_.template Pop<typename TargetEncoding::Ch>(stackStream.length_), stackStream.length_ - 1, true);
...@@ -527,43 +568,45 @@ private: ...@@ -527,43 +568,45 @@ private:
template<unsigned parseFlags, typename InputStream, typename Handler> template<unsigned parseFlags, typename InputStream, typename Handler>
void ParseNumber(InputStream& is, Handler& handler) { void ParseNumber(InputStream& is, Handler& handler) {
StreamLocalCopy<InputStream, StreamTraits<InputStream>::copyOptimization> s(is); internal::StreamLocalCopy<InputStream> copy(is);
InputStream& s(copy.s);
// Parse minus // Parse minus
bool minus = false; bool minus = false;
if (s->Peek() == '-') { if (s.Peek() == '-') {
minus = true; minus = true;
s->Take(); s.Take();
} }
// Parse int: zero / ( digit1-9 *DIGIT ) // Parse int: zero / ( digit1-9 *DIGIT )
unsigned i; unsigned i;
bool try64bit = false; bool try64bit = false;
if (s->Peek() == '0') { if (s.Peek() == '0') {
i = 0; i = 0;
s->Take(); s.Take();
} }
else if (s->Peek() >= '1' && s->Peek() <= '9') { else if (s.Peek() >= '1' && s.Peek() <= '9') {
i = static_cast<unsigned>(s->Take() - '0'); i = static_cast<unsigned>(s.Take() - '0');
if (minus) if (minus)
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (i >= 214748364) { // 2^31 = 2147483648 if (i >= 214748364) { // 2^31 = 2147483648
if (i != 214748364 || s->Peek() > '8') { if (i != 214748364 || s.Peek() > '8') {
try64bit = true; try64bit = true;
break; break;
} }
} }
i = i * 10 + static_cast<unsigned>(s->Take() - '0'); i = i * 10 + static_cast<unsigned>(s.Take() - '0');
} }
else else
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (i >= 429496729) { // 2^32 - 1 = 4294967295 if (i >= 429496729) { // 2^32 - 1 = 4294967295
if (i != 429496729 || s->Peek() > '5') { if (i != 429496729 || s.Peek() > '5') {
try64bit = true; try64bit = true;
break; break;
} }
} }
i = i * 10 + static_cast<unsigned>(s->Take() - '0'); i = i * 10 + static_cast<unsigned>(s.Take() - '0');
} }
} }
else else
...@@ -575,22 +618,22 @@ private: ...@@ -575,22 +618,22 @@ private:
if (try64bit) { if (try64bit) {
i64 = i; i64 = i;
if (minus) if (minus)
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (i64 >= UINT64_C(922337203685477580)) // 2^63 = 9223372036854775808 if (i64 >= UINT64_C(922337203685477580)) // 2^63 = 9223372036854775808
if (i64 != UINT64_C(922337203685477580) || s->Peek() > '8') { if (i64 != UINT64_C(922337203685477580) || s.Peek() > '8') {
useDouble = true; useDouble = true;
break; break;
} }
i64 = i64 * 10 + static_cast<unsigned>(s->Take() - '0'); i64 = i64 * 10 + static_cast<unsigned>(s.Take() - '0');
} }
else else
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (i64 >= UINT64_C(1844674407370955161)) // 2^64 - 1 = 18446744073709551615 if (i64 >= UINT64_C(1844674407370955161)) // 2^64 - 1 = 18446744073709551615
if (i64 != UINT64_C(1844674407370955161) || s->Peek() > '5') { if (i64 != UINT64_C(1844674407370955161) || s.Peek() > '5') {
useDouble = true; useDouble = true;
break; break;
} }
i64 = i64 * 10 + static_cast<unsigned>(s->Take() - '0'); i64 = i64 * 10 + static_cast<unsigned>(s.Take() - '0');
} }
} }
...@@ -598,59 +641,59 @@ private: ...@@ -598,59 +641,59 @@ private:
double d = 0.0; double d = 0.0;
if (useDouble) { if (useDouble) {
d = (double)i64; d = (double)i64;
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (d >= 1E307) if (d >= 1E307)
RAPIDJSON_PARSE_ERROR(kParesErrorNumberTooBig, is.Tell()); RAPIDJSON_PARSE_ERROR(kParesErrorNumberTooBig, is.Tell());
d = d * 10 + (s->Take() - '0'); d = d * 10 + (s.Take() - '0');
} }
} }
// Parse frac = decimal-point 1*DIGIT // Parse frac = decimal-point 1*DIGIT
int expFrac = 0; int expFrac = 0;
if (s->Peek() == '.') { if (s.Peek() == '.') {
if (!useDouble) { if (!useDouble) {
d = try64bit ? (double)i64 : (double)i; d = try64bit ? (double)i64 : (double)i;
useDouble = true; useDouble = true;
} }
s->Take(); s.Take();
if (s->Peek() >= '0' && s->Peek() <= '9') { if (s.Peek() >= '0' && s.Peek() <= '9') {
d = d * 10 + (s->Take() - '0'); d = d * 10 + (s.Take() - '0');
--expFrac; --expFrac;
} }
else else
RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, is.Tell()); RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, is.Tell());
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
if (expFrac > -16) { if (expFrac > -16) {
d = d * 10 + (s->Peek() - '0'); d = d * 10 + (s.Peek() - '0');
--expFrac; --expFrac;
} }
s->Take(); s.Take();
} }
} }
// Parse exp = e [ minus / plus ] 1*DIGIT // Parse exp = e [ minus / plus ] 1*DIGIT
int exp = 0; int exp = 0;
if (s->Peek() == 'e' || s->Peek() == 'E') { if (s.Peek() == 'e' || s.Peek() == 'E') {
if (!useDouble) { if (!useDouble) {
d = try64bit ? (double)i64 : (double)i; d = try64bit ? (double)i64 : (double)i;
useDouble = true; useDouble = true;
} }
s->Take(); s.Take();
bool expMinus = false; bool expMinus = false;
if (s->Peek() == '+') if (s.Peek() == '+')
s->Take(); s.Take();
else if (s->Peek() == '-') { else if (s.Peek() == '-') {
s->Take(); s.Take();
expMinus = true; expMinus = true;
} }
if (s->Peek() >= '0' && s->Peek() <= '9') { if (s.Peek() >= '0' && s.Peek() <= '9') {
exp = s->Take() - '0'; exp = s.Take() - '0';
while (s->Peek() >= '0' && s->Peek() <= '9') { while (s.Peek() >= '0' && s.Peek() <= '9') {
exp = exp * 10 + (s->Take() - '0'); exp = exp * 10 + (s.Take() - '0');
if (exp > 308) if (exp > 308)
RAPIDJSON_PARSE_ERROR(kParesErrorNumberTooBig, is.Tell()); RAPIDJSON_PARSE_ERROR(kParesErrorNumberTooBig, is.Tell());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment