diff --git a/src/ulib/net/server/plugin/usp/mdb.usp b/src/ulib/net/server/plugin/usp/mdb.usp index c9b23dbe..3d6a49e7 100644 --- a/src/ulib/net/server/plugin/usp/mdb.usp +++ b/src/ulib/net/server/plugin/usp/mdb.usp @@ -55,7 +55,7 @@ UString result; #ifdef AS_cpoll_cppsp_DO char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); uint32_t sz = result.size(); u_put_unalignedp32(ptr, U_MULTICHAR_CONSTANT32('{','"','i','d')); diff --git a/src/ulib/net/server/plugin/usp/mfortune.usp b/src/ulib/net/server/plugin/usp/mfortune.usp index 43fabc02..78bd9aae 100644 --- a/src/ulib/net/server/plugin/usp/mfortune.usp +++ b/src/ulib/net/server/plugin/usp/mfortune.usp @@ -53,8 +53,10 @@ static void usp_end_mfortune() --> Fortunes
idmessage
diff --git a/src/ulib/net/server/plugin/usp/mquery.usp b/src/ulib/net/server/plugin/usp/mquery.usp index b6b94e43..d282f3fb 100644 --- a/src/ulib/net/server/plugin/usp/mquery.usp +++ b/src/ulib/net/server/plugin/usp/mquery.usp @@ -63,10 +63,10 @@ UString rnumber; int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500); #ifdef AS_cpoll_cppsp_DO -UClientImage_Base::wbuffer->setBuffer(36U * num_queries); +(void) UClientImage_Base::wbuffer->reserve(36U * num_queries); char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); *ptr++ = '['; #endif @@ -75,8 +75,6 @@ while (true) { (void) mc->findOne(id = u_get_num_random(10000-1), query); - rnumber.clear(); - (void) U_JFIND(mc->vitem[0], "randomNumber", rnumber); #ifdef AS_cpoll_cppsp_DO @@ -103,6 +101,8 @@ while (true) pvworld_query->push_back(pworld); #endif + rnumber.clear(); + if (++i == num_queries) break; #ifdef AS_cpoll_cppsp_DO diff --git a/src/ulib/net/server/plugin/usp/mupdate.usp b/src/ulib/net/server/plugin/usp/mupdate.usp index e0ecdb80..5bc49e56 100644 --- a/src/ulib/net/server/plugin/usp/mupdate.usp +++ b/src/ulib/net/server/plugin/usp/mupdate.usp @@ -63,10 +63,10 @@ uint32_t id, rnum; int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500); #ifdef AS_cpoll_cppsp_DO -UClientImage_Base::wbuffer->setBuffer(36U * num_queries); +(void) UClientImage_Base::wbuffer->reserve(36U * num_queries); char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); *ptr++ = '['; #endif diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp index c9b23dbe..3d6a49e7 100644 --- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp +++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mdb.usp @@ -55,7 +55,7 @@ UString result; #ifdef AS_cpoll_cppsp_DO char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); uint32_t sz = result.size(); u_put_unalignedp32(ptr, U_MULTICHAR_CONSTANT32('{','"','i','d')); diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mfortune.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mfortune.usp index 43fabc02..78bd9aae 100644 --- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mfortune.usp +++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mfortune.usp @@ -53,8 +53,10 @@ static void usp_end_mfortune() --> Fortunes
idmessage
diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp index b6b94e43..d282f3fb 100644 --- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp +++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mquery.usp @@ -63,10 +63,10 @@ UString rnumber; int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500); #ifdef AS_cpoll_cppsp_DO -UClientImage_Base::wbuffer->setBuffer(36U * num_queries); +(void) UClientImage_Base::wbuffer->reserve(36U * num_queries); char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); *ptr++ = '['; #endif @@ -75,8 +75,6 @@ while (true) { (void) mc->findOne(id = u_get_num_random(10000-1), query); - rnumber.clear(); - (void) U_JFIND(mc->vitem[0], "randomNumber", rnumber); #ifdef AS_cpoll_cppsp_DO @@ -103,6 +101,8 @@ while (true) pvworld_query->push_back(pworld); #endif + rnumber.clear(); + if (++i == num_queries) break; #ifdef AS_cpoll_cppsp_DO diff --git a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp index e0ecdb80..5bc49e56 100644 --- a/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp +++ b/tests/examples/benchmark/FrameworkBenchmarks/ULib/src/mupdate.usp @@ -63,10 +63,10 @@ uint32_t id, rnum; int i = 0, num_queries = UHTTP::getFormFirstNumericValue(1, 500); #ifdef AS_cpoll_cppsp_DO -UClientImage_Base::wbuffer->setBuffer(36U * num_queries); +(void) UClientImage_Base::wbuffer->reserve(36U * num_queries); char* s = UClientImage_Base::wbuffer->data(); -char* ptr = s; +char* ptr = UClientImage_Base::wbuffer->end(); *ptr++ = '['; #endif