Second Life viewer sources 1.15.0.2

1 files changed, 23 insertions, 2 deletions

diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp
index c87d7d1..80a4336 100644
--- a/linden/indra/test/llsdserialize_tut.cpp
+++ b/linden/indra/test/llsdserialize_tut.cpp
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -33,7 +34,7 @@
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "lltut.h"
-
+#include "llformat.h"
 
 namespace tut
 {
@@ -212,6 +213,7 @@ namespace tut
         {
                 std::stringstream stream;       
                 mFormatter->format(v, stream);
+                //llinfos << "checkRoundTrip: length " << stream.str().length() << llendl;
                 LLSD w;
                 mParser->parse(stream, w);
                 
@@ -226,6 +228,22 @@ namespace tut
                         throw;
                 }
         }
+
+        static void fillmap(LLSD& root, U32 width, U32 depth)
+        {
+                if(depth == 0)
+                {
+                        root["foo"] = "bar";
+                        return;
+                }
+
+                for(U32 i = 0; i < width; ++i)
+                {
+                        std::string key = llformat("child %d", i);
+                        root[key] = LLSD::emptyMap();
+                        fillmap(root[key], width, depth - 1);
+                }
+        }
         
         void TestLLSDSerializeData::doRoundTripTests(const std::string& msg)
         {
@@ -389,6 +407,10 @@ namespace tut
                 v[0][0] = true;
                 v[1][0] = false;
                 checkRoundTrip(msg + " nested arrays", v);
+
+                v = LLSD::emptyMap();
+                fillmap(v, 10, 6); // 10^6 maps
+                checkRoundTrip(msg + " many nested maps", v);
         }
         
         typedef tut::test_group<TestLLSDSerializeData> TestLLSDSerialzeGroup;
@@ -547,7 +569,6 @@ namespace tut
                         "</array></llsd>", v);
         }
 
-
         /*
         TODO:
                 test XML parsing