diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-04 16:59:48 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-04 16:59:48 -0500 |
commit | ca703b2b9cd9469ad86539f2b95dbf1162b786f2 (patch) | |
tree | e0be3a637b5ff96fce361ae9e1180a536d1c95c2 | |
parent | 75f412549242c949851938ffeac65b9e7145de5e (diff) |
Make llleap_test.cpp avoid hard limit on MSVC std::ostringstream max.
In load testing, we have observed intermittent failures on Windows in which
LLSDNotationStreamer into std::ostringstream seems to bump into a hard limit
of 1048590 bytes. ostringstream reports that much buffered data and returns
that much -- even though, on examination, the notation-serialized stream is
incomplete at that point. It's our intention to load-test LLLeap and
LLProcess, not the local iostream implementation; we hope that this kind of
data volume is comfortably greater than actual usage. Back off the
load-testing max size a bit.
-rw-r--r-- | indra/llcommon/tests/llleap_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp index 4fb80df788..677f4830ea 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -40,7 +40,7 @@ StringVec sv(const StringVec& listof) { return listof; } #define sleep(secs) _sleep((secs) * 1000) #endif -const size_t BUFFERED_LENGTH = 1024*1024; // try wrangling a megabyte of data +const size_t BUFFERED_LENGTH = 1024*1023; // try wrangling just under a megabyte of data void waitfor(const std::vector<LLLeap*>& instances, int timeout=60) { @@ -139,13 +139,13 @@ namespace tut // dumping the entire packet wastes time and space. // But if the error states a particular byte offset, // truncate to (near) that offset when dumping data. - " location = re.search(r' at byte ([0-9]+)', str(e))\n" + " location = re.search(r' at (byte|index) ([0-9]+)', str(e))\n" " if not location:\n" " # didn't find offset, dump whole thing, no ellipsis\n" " ellipsis = ''\n" " else:\n" " # found offset within error message\n" - " trunc = int(location.group(1)) + showmax\n" + " trunc = int(location.group(2)) + showmax\n" " data = data[:trunc]\n" " ellipsis = '... (%s more)' % (length - trunc)\n" " offset = -showmax\n" |