make the test really use the different socket flags and disable the use of wxSOCKET_N...

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

diff --git a/tests/benchmarks/bench.cpp b/tests/benchmarks/bench.cpp
index c885d337edc9ab14fab216a65c6efc6529de6710..0d694e78262ffdb59d1e01145cf425526d3f25e4 100644 (file)
--- a/tests/benchmarks/bench.cpp
+++ b/tests/benchmarks/bench.cpp
@@ -27,6 +27,7 @@
 // ----------------------------------------------------------------------------
 
 static const char OPTION_LIST = 'l';
 // ----------------------------------------------------------------------------
 
 static const char OPTION_LIST = 'l';

+static const char OPTION_SINGLE = '1';

 
 static const char OPTION_AVG_COUNT = 'a';
 static const char OPTION_NUM_RUNS = 'n';
 
 static const char OPTION_AVG_COUNT = 'a';
 static const char OPTION_NUM_RUNS = 'n';


@@ -124,6 +125,10 @@ void BenchApp::OnInitCmdLine(wxCmdLineParser& parser)
                      "list",
                      "list all the existing benchmarks");
 
                      "list",
                      "list all the existing benchmarks");
 

+    parser.AddSwitch(OPTION_SINGLE,
+                     "single",
+                     "run the benchmark once only");
+

     parser.AddOption(OPTION_AVG_COUNT,
                      "avg-count",
                      wxString::Format
     parser.AddOption(OPTION_AVG_COUNT,
                      "avg-count",
                      wxString::Format


@@ -180,10 +185,25 @@ bool BenchApp::OnCmdLineParsed(wxCmdLineParser& parser)
         return false;
     }
 
         return false;
     }
 

-    parser.Found(OPTION_AVG_COUNT, &m_avgCount);
-    parser.Found(OPTION_NUM_RUNS, &m_numRuns);
+    bool numRunsSpecified = false;
+    if ( parser.Found(OPTION_AVG_COUNT, &m_avgCount) )
+        numRunsSpecified = true;
+    if ( parser.Found(OPTION_NUM_RUNS, &m_numRuns) )
+        numRunsSpecified = true;

     parser.Found(OPTION_NUMERIC_PARAM, &m_numParam);
     parser.Found(OPTION_STRING_PARAM, &m_strParam);
     parser.Found(OPTION_NUMERIC_PARAM, &m_numParam);
     parser.Found(OPTION_STRING_PARAM, &m_strParam);

+    if ( parser.Found(OPTION_SINGLE) )
+    {
+        if ( numRunsSpecified )
+        {
+            wxFprintf(stderr, "Incompatible options specified.\n");
+
+            return false;
+        }
+
+        m_avgCount =
+        m_numRuns = 1;
+    }

 
     // construct sorted array for quick verification of benchmark names
     wxSortedArrayString benchmarks;
 
     // construct sorted array for quick verification of benchmark names
     wxSortedArrayString benchmarks;


@@ -234,8 +254,8 @@ int BenchApp::OnRun()
         long timeMin = LONG_MAX,
              timeMax = 0,
              timeTotal = 0;
         long timeMin = LONG_MAX,
              timeMax = 0,
              timeTotal = 0;

-        bool ok = true;
-        for ( long a = 0; a < m_avgCount; a++ )
+        bool ok = func->Init();
+        for ( long a = 0; ok && a < m_avgCount; a++ )

         {
             wxStopWatch sw;
             for ( long n = 0; n < m_numRuns && ok; n++ )
         {
             wxStopWatch sw;
             for ( long n = 0; n < m_numRuns && ok; n++ )


@@ -245,9 +265,6 @@ int BenchApp::OnRun()
 
             sw.Pause();
 
 
             sw.Pause();
 

-            if ( !ok )
-                break;
-

             const long t = sw.Time();
             if ( t < timeMin )
                 timeMin = t;
             const long t = sw.Time();
             if ( t < timeMin )
                 timeMin = t;


@@ -256,6 +273,8 @@ int BenchApp::OnRun()
             timeTotal += t;
         }
 
             timeTotal += t;
         }
 

+        func->Done();
+

         if ( !ok )
         {
             wxPrintf("ERROR\n");
         if ( !ok )
         {
             wxPrintf("ERROR\n");