diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
| commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
| tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/llcommon/llsdserialize_xml.cpp | |
| parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
Merge.
Diffstat (limited to 'indra/llcommon/llsdserialize_xml.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize_xml.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp index c5a7c6fc15..d8213c4477 100644 --- a/indra/llcommon/llsdserialize_xml.cpp +++ b/indra/llcommon/llsdserialize_xml.cpp @@ -354,6 +354,7 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize) return count; } +LLFastTimer::DeclareTimer FTM_SD_PARSE_READ_STREAM("LLSD Read Stream"); S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) { XML_Status status; @@ -373,10 +374,13 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) { break; } - count = get_till_eol(input, (char *)buffer, BUFFER_SIZE); - if (!count) - { - break; + { LLFastTimer _(FTM_SD_PARSE_READ_STREAM); + + count = get_till_eol(input, (char *)buffer, BUFFER_SIZE); + if (!count) + { + break; + } } status = XML_ParseBuffer(mParser, count, false); |