generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

JSON Parser performance improvements

Browse Source
This commit is contained in:
Günter Obiltschnig 2021-06-15 20:18:41 +02:00
parent c4c2df26b3
commit f7d7660335
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
JSON/src/ParserImpl.cpp
View File

@ -38,14 +38,14 @@ extern "C"
{ {
static int istream_get(void* ptr) static int istream_get(void* ptr)
{ {
std::istream* pIstr = reinterpret_cast<std::istream*>(ptr); std::streambuf* pBuf = reinterpret_cast<std::streambuf*>(ptr);
return pIstr->get(); return pBuf->sbumpc();
} }
static int istream_peek(void* ptr) static int istream_peek(void* ptr)
{ {
std::istream* pIstr = reinterpret_cast<std::istream*>(ptr); std::streambuf* pBuf = reinterpret_cast<std::streambuf*>(ptr);
return pIstr->peek(); return pBuf->sgetc();
} }
} }
@ -102,7 +102,7 @@ void ParserImpl::handle(std::istream& json)
{ {
try try
{ {
json_open_user(_pJSON, istream_get, istream_peek, &json); json_open_user(_pJSON, istream_get, istream_peek, json.rdbuf());
checkError(); checkError();
json_set_streaming(_pJSON, false); json_set_streaming(_pJSON, false);
handle(); handle();
@ -193,6 +193,9 @@ void ParserImpl::stripComments(std::string& json)
void ParserImpl::handleArray() void ParserImpl::handleArray()
{ {
if (json_get_depth(_pJSON) > _depth)
throw JSONException("Maximum depth exceeded");
json_type tok = json_peek(_pJSON); json_type tok = json_peek(_pJSON);
while (tok != JSON_ARRAY_END && checkError()) while (tok != JSON_ARRAY_END && checkError())
{ {
@ -210,6 +213,9 @@ void ParserImpl::handleArray()
void ParserImpl::handleObject() void ParserImpl::handleObject()
{ {
if (json_get_depth(_pJSON) > _depth)
throw JSONException("Maximum depth exceeded");
json_type tok = json_peek(_pJSON); json_type tok = json_peek(_pJSON);
while (tok != JSON_OBJECT_END && checkError()) while (tok != JSON_OBJECT_END && checkError())
{ {
@ -229,9 +235,6 @@ void ParserImpl::handleObject()
void ParserImpl::handle() void ParserImpl::handle()
{ {
if (json_get_depth(_pJSON) > _depth)
throw JSONException("Maximum depth exceeded");
enum json_type type = json_next(_pJSON); enum json_type type = json_next(_pJSON);
switch (type) switch (type)
{ {