Make parallel unit testing work on windows

Review URL: https://codereview.chromium.org/14072002

git-svn-id: http://skia.googlecode.com/svn/trunk@8594 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 48 insertions, 60 deletions

diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index 80527f9e5e..31e8065470 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -5,87 +5,75 @@
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
+#include "PathOpsThreadedCommon.h"
 
-static THREAD_TYPE testOpCubicsMain(void* data)
+static void testOpCubicsMain(PathOpsThreadState* data)
 {
     SkASSERT(data);
-    State4& state = *(State4*) data;
+    PathOpsThreadState& state = *data;
     char pathStr[1024];  // gdb: set print elements 400
     sk_bzero(pathStr, sizeof(pathStr));
-    do {
-        for (int a = 0 ; a < 6; ++a) {
-        for (int b = a + 1 ; b < 7; ++b)  {
-        for (int c = 0 ; c < 6; ++c)          {
-        for (int d = c + 1 ; d < 7; ++d)           {
-        for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
-        for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f)   {
-            SkPath pathA, pathB;
-            char* str = pathStr;
-            pathA.setFillType((SkPath::FillType) e);
-            str += sprintf(str, "    path.setFillType(SkPath::k%s_FillType);\n",
-                    e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
-                    ? "EvenOdd" : "?UNDEFINED");
-            pathA.moveTo(SkIntToScalar(state.a), SkIntToScalar(state.b));
-            str += sprintf(str, "    path.moveTo(%d,%d);\n", state.a, state.b);
-            pathA.cubicTo(SkIntToScalar(state.c), SkIntToScalar(state.d), SkIntToScalar(b),
-                    SkIntToScalar(a), SkIntToScalar(d), SkIntToScalar(c));
-            str += sprintf(str, "    path.cubicTo(%d,%d, %d,%d, %d,%d);\n", state.c, state.d,
-                    b, a, d, c);
-            pathA.close();
-            str += sprintf(str, "    path.close();\n");
-            pathB.setFillType((SkPath::FillType) f);
-            str += sprintf(str, "    pathB.setFillType(SkPath::k%s_FillType);\n",
-                    f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
-                    ? "EvenOdd" : "?UNDEFINED");
-            pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b));
-            str += sprintf(str, "    pathB.moveTo(%d,%d);\n", a, b);
-            pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.b),
-                    SkIntToScalar(state.a), SkIntToScalar(state.d), SkIntToScalar(state.c));
-            str += sprintf(str, "    pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n", c, d,
-                    state.b, state.a, state.d, state.c);
-            pathB.close();
-            str += sprintf(str, "    pathB.close();\n");
-            for (int op = 0 ; op <= kXOR_PathOp; ++op)    {
-                outputProgress(state, pathStr, (SkPathOp) op);
-                testPathOp(state.reporter, pathA, pathB, (SkPathOp) op);
-                state.testsRun++;
-            }
-                                }
-                            }
-                        }
+    for (int a = 0 ; a < 6; ++a) {
+        for (int b = a + 1 ; b < 7; ++b) {
+            for (int c = 0 ; c < 6; ++c) {
+                for (int d = c + 1 ; d < 7; ++d) {
+                    for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
+    for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
+        SkPath pathA, pathB;
+        char* str = pathStr;
+        pathA.setFillType((SkPath::FillType) e);
+        str += sprintf(str, "    path.setFillType(SkPath::k%s_FillType);\n",
+                e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
+                ? "EvenOdd" : "?UNDEFINED");
+        pathA.moveTo(SkIntToScalar(state.fA), SkIntToScalar(state.fB));
+        str += sprintf(str, "    path.moveTo(%d,%d);\n", state.fA, state.fB);
+        pathA.cubicTo(SkIntToScalar(state.fC), SkIntToScalar(state.fD), SkIntToScalar(b),
+                SkIntToScalar(a), SkIntToScalar(d), SkIntToScalar(c));
+        str += sprintf(str, "    path.cubicTo(%d,%d, %d,%d, %d,%d);\n", state.fC, state.fD,
+                b, a, d, c);
+        pathA.close();
+        str += sprintf(str, "    path.close();\n");
+        pathB.setFillType((SkPath::FillType) f);
+        str += sprintf(str, "    pathB.setFillType(SkPath::k%s_FillType);\n",
+                f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
+                ? "EvenOdd" : "?UNDEFINED");
+        pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b));
+        str += sprintf(str, "    pathB.moveTo(%d,%d);\n", a, b);
+        pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB),
+                SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(state.fC));
+        str += sprintf(str, "    pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n", c, d,
+                state.fB, state.fA, state.fD, state.fC);
+        pathB.close();
+        str += sprintf(str, "    pathB.close();\n");
+        for (int op = 0 ; op <= kXOR_PathOp; ++op)    {
+            outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
+            testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op);
+        }
+    }
                     }
                 }
             }
-    } while (runNextTestSet(state));
-    THREAD_RETURN
+        }
+    }
 }
 
 static void TestOpCubicsThreaded(skiatest::Reporter* reporter)
 {
-    int testsRun = 0;
-    if (gShowTestProgress) SkDebugf("%s\n", __FUNCTION__);
-#ifdef SK_DEBUG
-    gDebugMaxWindSum = 4;
-    gDebugMaxWindValue = 4;
-#endif
-    const char testLineStr[] = "cubicOp";
-    initializeTests(reporter, testLineStr, sizeof(testLineStr));
+    int threadCount = initializeTests("cubicOp");
+    PathOpsThreadedTestRunner testRunner(reporter, threadCount);
     for (int a = 0; a < 6; ++a) {  // outermost
         for (int b = a + 1; b < 7; ++b) {
             for (int c = 0 ; c < 6; ++c) {
                 for (int d = c + 1; d < 7; ++d) {
-                    testsRun += dispatchTest4(testOpCubicsMain, a, b, c, d);
+                    *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
+                            (&testOpCubicsMain, a, b, c, d, &testRunner));
                 }
-                if (gShowTestProgress) SkDebugf(".");
             }
-            if (!gAllowExtendedTest) goto finish;
-            if (gShowTestProgress) SkDebugf("%d", b);
+            if (!reporter->allowExtendedTest()) goto finish;
         }
-        if (gShowTestProgress) SkDebugf("\n%d", a);
     }
 finish:
-    testsRun += waitForCompletion();
-    if (gShowTestProgress) SkDebugf("%s tests=%d\n", __FUNCTION__, testsRun);
+    testRunner.render();
 }
 
 #include "TestClassDef.h"