Removed dummy wxFont == operator implementation (IIRC was needed to compile with...

[wxWidgets.git] / tests / benchmarks / strings.cpp

diff --git a/tests/benchmarks/strings.cpp b/tests/benchmarks/strings.cpp
index 23a181d8c38b9fbaa47becc93dfd882bfcfd6e1f..9449f49110065268b08dda3264e22f8026143cbe 100644 (file)
--- a/tests/benchmarks/strings.cpp
+++ b/tests/benchmarks/strings.cpp
@@ -40,6 +40,27 @@ static const char utf8str[] =
     "\xD0\xA6\xD0\xB5\xD0\xBB\xD0\xBE\xD0\xB5 \xD1\x87\xD0\xB8\xD1\x81\xD0\xBB\xD0\xBE 9"
     ;
 
     "\xD0\xA6\xD0\xB5\xD0\xBB\xD0\xBE\xD0\xB5 \xD1\x87\xD0\xB8\xD1\x81\xD0\xBB\xD0\xBE 9"
     ;
 

+namespace
+{
+
+const wxString& GetTestAsciiString()
+{
+    static wxString testString;
+    if ( testString.empty() )
+    {
+        long num = Bench::GetNumericParameter();
+        if ( !num )
+            num = 1;
+
+        for ( long n = 0; n < num; n++ )
+            testString += wxString::FromAscii(asciistr);
+    }
+
+    return testString;
+}
+
+} // anonymous namespace
+

 // this is just a baseline
 BENCHMARK_FUNC(Strlen)
 {
 // this is just a baseline
 BENCHMARK_FUNC(Strlen)
 {


@@ -187,7 +208,7 @@ BENCHMARK_FUNC(ForCString)
 
 BENCHMARK_FUNC(ForStringIndex)
 {
 
 BENCHMARK_FUNC(ForStringIndex)
 {

-    const wxString s = wxString::FromAscii(asciistr);
+    const wxString& s = GetTestAsciiString();

     const size_t len = s.length();
     for ( size_t n = 0; n < len; n++ )
     {
     const size_t len = s.length();
     for ( size_t n = 0; n < len; n++ )
     {


@@ -200,7 +221,7 @@ BENCHMARK_FUNC(ForStringIndex)
 
 BENCHMARK_FUNC(ForStringIter)
 {
 
 BENCHMARK_FUNC(ForStringIter)
 {

-    const wxString s = wxString::FromAscii(asciistr);
+    const wxString& s = GetTestAsciiString();

     const wxString::const_iterator end = s.end();
     for ( wxString::const_iterator i = s.begin(); i != end; ++i )
     {
     const wxString::const_iterator end = s.end();
     for ( wxString::const_iterator i = s.begin(); i != end; ++i )
     {


@@ -213,7 +234,7 @@ BENCHMARK_FUNC(ForStringIter)
 
 BENCHMARK_FUNC(ForStringRIter)
 {
 
 BENCHMARK_FUNC(ForStringRIter)
 {

-    const wxString s = wxString::FromAscii(asciistr);
+    const wxString& s = GetTestAsciiString();

     const wxString::const_reverse_iterator rend = s.rend();
     for ( wxString::const_reverse_iterator i = s.rbegin(); i != rend; ++i )
     {
     const wxString::const_reverse_iterator rend = s.rend();
     for ( wxString::const_reverse_iterator i = s.rbegin(); i != rend; ++i )
     {


@@ -301,7 +322,11 @@ BENCHMARK_FUNC(ParseHTML)
 
         // this is going to make for some invalid HTML, of course, but it
         // doesn't really matter
 
         // this is going to make for some invalid HTML, of course, but it
         // doesn't really matter

-        for ( long n = 0; n < Bench::GetNumericParameter(); n++ )
+        long num = Bench::GetNumericParameter();
+        if ( !num )
+            num = 1;
+
+        for ( long n = 0; n < num; n++ )

             html += html1;
     }
 
             html += html1;
     }