update pathops to circle sort

tests/PathOpsExtendedTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkForceLinking.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkRTConf.h"
 #include "SkStream.h"
+#include "SkThread.h"
 #include "SkThreadPool.h"
 
 #ifdef SK_BUILD_FOR_MAC
 #include <sys/sysctl.h>
 #endif
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 static const char marker[] =
     "</div>\n"
@@ skipping 27 matching lines @@
     "kInverseWinding_FillType",
     "kInverseEvenOdd_FillType"
 };
 
 static void output_scalar(SkScalar num) {
     if (num == (int) num) {
         SkDebugf("%d", (int) num);
     } else {
         SkString str;
         str.printf("%1.9g", num);
-        int width = str.size();
+        int width = (int) str.size();
         const char* cStr = str.c_str();
         while (cStr[width - 1] == '0') {
             --width;
         }
         str.resize(width);
         SkDebugf("%sf", str.c_str());
     }
 }
 
 static void output_points(const SkPoint* pts, int count) {
@@ skipping 67 matching lines @@
     SkDebugf("    %s.setFillType(SkPath::%s);\n", pathName, gFillTypeStr[fillType]);
     iter.setPath(path);
     showPathContours(iter, pathName);
 }
 
 #if DEBUG_SHOW_TEST_NAME
 static void showPathData(const SkPath& path) {
     SkPath::RawIter iter(path);
     uint8_t verb;
     SkPoint pts[4];
-    SkPoint firstPt, lastPt;
+    SkPoint firstPt = {0, 0}, lastPt = {0, 0};
     bool firstPtSet = false;
     bool lastPtSet = true;
     while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
         switch (verb) {
             case SkPath::kMove_Verb:
                 firstPt = pts[0];
                 firstPtSet = true;
                 continue;
             case SkPath::kLine_Verb:
                 SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", pts[0].fX, pts[0].fY,
@@ skipping 47 matching lines @@
             SkDebugf("op reverse difference\n");
             break;
         default:
             SkASSERT(0);
     }
 }
 
 #if DEBUG_SHOW_TEST_NAME
 
 void ShowFunctionHeader(const char* functionName) {
-    SkDebugf("\nstatic void %s(skiatest::Reporter* reporter) {\n", functionName);
+    SkDebugf("\nstatic void %s(skiatest::Reporter* reporter, const char* filename) {\n", functionName);
     if (strcmp("skphealth_com76", functionName) == 0) {
         SkDebugf("found it\n");
     }
 }
 
 static const char* gOpStrs[] = {
     "kDifference_PathOp",
     "kIntersect_PathOp",
     "kUnion_PathOp",
     "kXor_PathOp",
     "kReverseDifference_PathOp",
 };
 
 void ShowOp(SkPathOp op, const char* pathOne, const char* pathTwo) {
-    SkDebugf("    testPathOp(reporter, %s, %s, %s);\n", pathOne, pathTwo, gOpStrs[op]);
+    SkDebugf("    testPathOp(reporter, %s, %s, %s, filename);\n", pathOne, pathTwo, gOpStrs[op]);
     SkDebugf("}\n");
 }
 #endif
 
 #if DEBUG_SHOW_TEST_NAME
 static char hexorator(int x) {
     if (x < 10) {
         return x + '0';
     }
     x -= 10;
@@ skipping 67 matching lines @@
         for (int x = 0; x < bitWidth - 1; ++x) {
             // count 2x2 blocks
             bool err = addr1[x] != addr3[x];
             if (err) {
                 errors2 += addr1[x + 1] != addr3[x + 1]
                         && addr2[x] != addr4[x] && addr2[x + 1] != addr4[x + 1];
                 errors++;
             }
         }
     }
-    if (errors2 >= 6 || errors > 160) {
-        SkDebugf("%s errors2=%d errors=%d\n", __FUNCTION__, errors2, errors);
-    }
     error2x2 = errors2;
     return errors;
 }
 
 static int pathsDrawTheSame(const SkPath& one, const SkPath& two, SkBitmap& bits, SkPath& scaledOne,
         SkPath& scaledTwo, int& error2x2) {
     SkMatrix scale;
     scaleMatrix(one, two, scale);
     one.transform(scale, &scaledOne);
     two.transform(scale, &scaledTwo);
@@ skipping 40 matching lines @@
         *outPtr++ = '|';
         for (x = bitWidth; x < bitWidth * 2; ++x) {
             *outPtr++ = addr1[x] == (uint32_t) -1 ? '_' : 'x';
         }
         *outPtr++ = '\0';
         SkDebugf("%s\n", out);
     }
     return true;
 }
 
-static void showSimplifiedPath(const SkPath& one, const SkPath& two,
-        const SkPath& scaledOne, const SkPath& scaledTwo) {
-    showPath(one, "path", false);
-    drawAsciiPaths(scaledOne, scaledTwo, true);
-}
-
-static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const SkPath& two,
-                 SkBitmap& bitmap) {
+static int comparePaths(skiatest::Reporter* reporter, const char* filename, const SkPath& one,
+        const SkPath& two, SkBitmap& bitmap) {
     int errors2x2;
     SkPath scaledOne, scaledTwo;
-    int errors = pathsDrawTheSame(one, two, bitmap, scaledOne, scaledTwo, errors2x2);
+    (void) pathsDrawTheSame(one, two, bitmap, scaledOne, scaledTwo, errors2x2);
     if (errors2x2 == 0) {
         return 0;
     }
     const int MAX_ERRORS = 9;
-    if (errors2x2 == MAX_ERRORS || errors2x2 == MAX_ERRORS - 1) {
-        showSimplifiedPath(one, two, scaledOne, scaledTwo);
-    }
-    if (errors2x2 > MAX_ERRORS && gComparePathsAssert) {
-        SkDebugf("%s errors=%d\n", __FUNCTION__, errors);
-        showSimplifiedPath(one, two, scaledOne, scaledTwo);
-        REPORTER_ASSERT(reporter, 0);
-    }
+    REPORTER_ASSERT(reporter, errors2x2 <= MAX_ERRORS || !gComparePathsAssert);
     return errors2x2 > MAX_ERRORS ? errors2x2 : 0;
 }
 
-static void showPathOpPath(const SkPath& one, const SkPath& two, const SkPath& a, const SkPath& b,
-        const SkPath& scaledOne, const SkPath& scaledTwo, const SkPathOp shapeOp,
-        const SkMatrix& scale) {
+const int gTestFirst = 4;
+static int gTestNo = gTestFirst;
+static SkTDArray<SkPathOp> gTestOp;
+
+static void showPathOpPath(const char* testName, const SkPath& one, const SkPath& two,
+        const SkPath& a, const SkPath& b, const SkPath& scaledOne, const SkPath& scaledTwo,
+        const SkPathOp shapeOp, const SkMatrix& scale) {
     SkASSERT((unsigned) shapeOp < SK_ARRAY_COUNT(opStrs));
-    SkDebugf("static void xOp#%s(skiatest::Reporter* reporter) {\n", opSuffixes[shapeOp]);
+    SkString defaultTestName;
+    if (!testName) {
+        defaultTestName.printf("xOp%d%s", gTestNo, opSuffixes[shapeOp]);
+        testName = defaultTestName.c_str();
+    }
+    SkDebugf("static void %s(skiatest::Reporter* reporter, const char* filename) {\n", testName);
+    *gTestOp.append() = shapeOp;
+    ++gTestNo;
     SkDebugf("    SkPath path, pathB;\n");
     showPath(a, "path", false);
     showPath(b, "pathB", false);
-    SkDebugf("    testPathOp(reporter, path, pathB, %s);\n", opStrs[shapeOp]);
+    SkDebugf("    testPathOp(reporter, path, pathB, %s, filename);\n", opStrs[shapeOp]);
     SkDebugf("}\n");
-    drawAsciiPaths(scaledOne, scaledTwo, true);
+    drawAsciiPaths(scaledOne, scaledTwo, false);
 }
 
-static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const SkPath& scaledOne,
-                        const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
-                        const SkPath& a, const SkPath& b, const SkPathOp shapeOp,
-                        const SkMatrix& scale) {
+void ShowTestArray() {
+    for (int x = gTestFirst; x < gTestNo; ++x) {
+        SkDebugf("    TEST(xOp%d%s),\n", x, opSuffixes[gTestOp[x - gTestFirst]]);
+    }
+}
+
+static int comparePaths(skiatest::Reporter* reporter, const char* testName, const SkPath& one,
+        const SkPath& scaledOne, const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
+        const SkPath& a, const SkPath& b, const SkPathOp shapeOp, const SkMatrix& scale) {
     int errors2x2;
-    int errors = pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);
+    (void) pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);
     if (errors2x2 == 0) {
         if (gShowPath) {
-            showPathOpPath(one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
+            showPathOpPath(testName, one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
         }
         return 0;
     }
     const int MAX_ERRORS = 8;
-    if (gShowPath || errors2x2 == MAX_ERRORS || errors2x2 == MAX_ERRORS - 1) {
-        showPathOpPath(one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
-    }
     if (errors2x2 > MAX_ERRORS && gComparePathsAssert) {
-        SkDebugf("%s errors=%d\n", __FUNCTION__, errors);
-        showPathOpPath(one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
+        SK_DECLARE_STATIC_MUTEX(compareDebugOut3);
+        SkAutoMutexAcquire autoM(compareDebugOut3);
+        showPathOpPath(testName, one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
         REPORTER_ASSERT(reporter, 0);
+    } else if (gShowPath || errors2x2 == MAX_ERRORS || errors2x2 == MAX_ERRORS - 1) {
+        SK_DECLARE_STATIC_MUTEX(compareDebugOut4);
+        SkAutoMutexAcquire autoM(compareDebugOut4);
+        showPathOpPath(testName, one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
     }
     return errors2x2 > MAX_ERRORS ? errors2x2 : 0;
 }
 
 // Default values for when reporter->verbose() is false.
-static int testNumber = 1;
+static int testNumber = 55;
 static const char* testName = "pathOpTest";
 
 static void writeTestName(const char* nameSuffix, SkMemoryWStream& outFile) {
     outFile.writeText(testName);
     outFile.writeDecAsText(testNumber);
+    ++testNumber;
     if (nameSuffix) {
         outFile.writeText(nameSuffix);
     }
 }
 
 static void outputToStream(const char* pathStr, const char* pathPrefix, const char* nameSuffix,
         const char* testFunction, bool twoPaths, SkMemoryWStream& outFile) {
+#if 0
     outFile.writeText("<div id=\"");
     writeTestName(nameSuffix, outFile);
     outFile.writeText("\">\n");
     if (pathPrefix) {
         outFile.writeText(pathPrefix);
     }
     outFile.writeText(pathStr);
     outFile.writeText("</div>\n\n");
 
     outFile.writeText(marker);
     outFile.writeText("    ");
     writeTestName(nameSuffix, outFile);
     outFile.writeText(",\n\n\n");
-
+#endif
     outFile.writeText("static void ");
     writeTestName(nameSuffix, outFile);
-    outFile.writeText("() {\n    SkPath path");
+    outFile.writeText("(skiatest::Reporter* reporter) {\n    SkPath path");
     if (twoPaths) {
         outFile.writeText(", pathB");
     }
     outFile.writeText(";\n");
     if (pathPrefix) {
         outFile.writeText(pathPrefix);
     }
     outFile.writeText(pathStr);
     outFile.writeText("    ");
     outFile.writeText(testFunction);
     outFile.writeText("\n}\n\n");
+#if 0
     outFile.writeText("static void (*firstTest)() = ");
     writeTestName(nameSuffix, outFile);
     outFile.writeText(";\n\n");
 
     outFile.writeText("static struct {\n");
     outFile.writeText("    void (*fun)();\n");
     outFile.writeText("    const char* str;\n");
     outFile.writeText("} tests[] = {\n");
     outFile.writeText("    TEST(");
     writeTestName(nameSuffix, outFile);
     outFile.writeText("),\n");
+#endif
     outFile.flush();
 }
 
 bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state,
                   const char* pathStr) {
     SkPath::FillType fillType = useXor ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
     path.setFillType(fillType);
     if (gShowPath) {
         showPath(path, "path", false);
     }
     if (!Simplify(path, &out)) {
         SkDebugf("%s did not expect failure\n", __FUNCTION__);
         REPORTER_ASSERT(state.fReporter, 0);
         return false;
     }
     if (!state.fReporter->verbose()) {
         return true;
     }
-    int result = comparePaths(state.fReporter, path, out, *state.fBitmap);
+    int result = comparePaths(state.fReporter, NULL, path, out, *state.fBitmap);
     if (result && gPathStrAssert) {
+        SK_DECLARE_STATIC_MUTEX(simplifyDebugOut);
+        SkAutoMutexAcquire autoM(simplifyDebugOut);
         char temp[8192];
         sk_bzero(temp, sizeof(temp));
         SkMemoryWStream stream(temp, sizeof(temp));
         const char* pathPrefix = NULL;
         const char* nameSuffix = NULL;
         if (fillType == SkPath::kEvenOdd_FillType) {
             pathPrefix = "    path.setFillType(SkPath::kEvenOdd_FillType);\n";
             nameSuffix = "x";
         }
-        const char testFunction[] = "testSimplifyx(path);";
+        const char testFunction[] = "testSimplify(reporter, path);";
         outputToStream(pathStr, pathPrefix, nameSuffix, testFunction, false, stream);
         SkDebugf(temp);
         REPORTER_ASSERT(state.fReporter, 0);
     }
     state.fReporter->bumpTestCount();
     return result == 0;
 }
 
-bool testSimplify(skiatest::Reporter* reporter, const SkPath& path) {
+bool testSimplify(skiatest::Reporter* reporter, const SkPath& path, const char* filename) {
 #if DEBUG_SHOW_TEST_NAME
     showPathData(path);
 #endif
     SkPath out;
     if (!Simplify(path, &out)) {
         SkDebugf("%s did not expect failure\n", __FUNCTION__);
         REPORTER_ASSERT(reporter, 0);
         return false;
     }
     SkBitmap bitmap;
-    int result = comparePaths(reporter, path, out, bitmap);
+    int result = comparePaths(reporter, filename, path, out, bitmap);
     if (result && gPathStrAssert) {
         REPORTER_ASSERT(reporter, 0);
     }
     reporter->bumpTestCount();
     return result == 0;
 }
 
 #if DEBUG_SHOW_TEST_NAME
 void SkPathOpsDebug::ShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp,
         const char* testName) {
     ShowFunctionHeader(testName);
     showPath(a, "path", true);
     showPath(b, "pathB", true);
     ShowOp(shapeOp, "path", "pathB");
 }
 #endif
 
+#if DEBUG_SHOW_TEST_NAME
+static void showName(const SkPath& a, const SkPath& b, const SkPathOp shapeOp) {
+    SkDebugf("\n");
+    showPathData(a);
+    showOp(shapeOp);
+    showPathData(b);
+}
+#endif
+
 static bool innerPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName, bool threaded) {
 #if DEBUG_SHOW_TEST_NAME
-    if (testName == NULL) {
-        SkDebugf("\n");
-        showPathData(a);
-        showOp(shapeOp);
-        showPathData(b);
-    } else {
-        SkPathOpsDebug::ShowPath(a, b, shapeOp, testName);
-    }
+    showName(a, b, shapeOp);
 #endif
     SkPath out;
     if (!Op(a, b, shapeOp, &out) ) {
         SkDebugf("%s did not expect failure\n", __FUNCTION__);
         REPORTER_ASSERT(reporter, 0);
         return false;
     }
     if (threaded && !reporter->verbose()) {
         return true;
     }
@@ skipping 14 matching lines @@
     scaledB.addPath(b, scale);
     scaledB.setFillType(b.getFillType());
     scaledRgnA.setPath(scaledA, openClip);
     scaledRgnB.setPath(scaledB, openClip);
     scaledRgnOut.op(scaledRgnA, scaledRgnB, (SkRegion::Op) shapeOp);
     scaledRgnOut.getBoundaryPath(&scaledPathOut);
     SkBitmap bitmap;
     SkPath scaledOut;
     scaledOut.addPath(out, scale);
     scaledOut.setFillType(out.getFillType());
-    int result = comparePaths(reporter, pathOut, scaledPathOut, out, scaledOut, bitmap, a, b,
-                              shapeOp, scale);
+    int result = comparePaths(reporter, testName, pathOut, scaledPathOut, out, scaledOut, bitmap,
+            a, b, shapeOp, scale);
     if (result && gPathStrAssert) {
         REPORTER_ASSERT(reporter, 0);
     }
     reporter->bumpTestCount();
     return result == 0;
 }
 
 bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName) {
     return innerPathOp(reporter, a, b, shapeOp, testName, false);
 }
 
+bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
+                 const SkPathOp shapeOp, const char* testName) {
+#if DEBUG_SHOW_TEST_NAME
+    showName(a, b, shapeOp);
+#endif
+    SkPath out;
+    if (Op(a, b, shapeOp, &out) ) {
+        SkDebugf("%s test is expected to fail\n", __FUNCTION__);
+        REPORTER_ASSERT(reporter, 0);
+        return false;
+    }
+    return true;
+}
+
 bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName) {
     return innerPathOp(reporter, a, b, shapeOp, testName, true);
 }
 
 SK_DECLARE_STATIC_MUTEX(gMutex);
 
 int initializeTests(skiatest::Reporter* reporter, const char* test) {
 #if 0  // doesn't work yet
     SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true);
     SK_CONF_SET("images.png.suppressDecoderWarnings", true);
 #endif
 #ifdef SK_DEBUG
     SkPathOpsDebug::gMaxWindSum = 4;
     SkPathOpsDebug::gMaxWindValue = 4;
 #endif
     if (reporter->verbose()) {
         SkAutoMutexAcquire lock(gMutex);
         testName = test;
         size_t testNameSize = strlen(test);
         SkFILEStream inFile("../../experimental/Intersection/op.htm");
         if (inFile.isValid()) {
             SkTDArray<char> inData;
-            inData.setCount(inFile.getLength());
+            inData.setCount((int) inFile.getLength());
             size_t inLen = inData.count();
             inFile.read(inData.begin(), inLen);
             inFile.setPath(NULL);
             char* insert = strstr(inData.begin(), marker);
             if (insert) {
                 insert += sizeof(marker) - 1;
                 const char* numLoc = insert + 4 /* indent spaces */ + testNameSize - 1;
                 testNumber = atoi(numLoc) + 1;
             }
         }
@@ skipping 15 matching lines @@
 
 void outputProgress(char* ramStr, const char* pathStr, SkPathOp op) {
     const char testFunction[] = "testOp(path);";
     SkASSERT((size_t) op < SK_ARRAY_COUNT(opSuffixes));
     const char* nameSuffix = opSuffixes[op];
     SkMemoryWStream rRamStream(ramStr, PATH_STR_SIZE);
     outputToStream(pathStr, NULL, nameSuffix, testFunction, true, rRamStream);
 }
 
 void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count,
-                void (*firstTest)(skiatest::Reporter* ),
-                void (*stopTest)(skiatest::Reporter* ), bool reverse) {
+                void (*firstTest)(skiatest::Reporter* , const char* filename),
+                void (*stopTest)(skiatest::Reporter* , const char* filename), bool reverse) {
     size_t index;
     if (firstTest) {
         index = count - 1;
         while (index > 0 && tests[index].fun != firstTest) {
             --index;
         }
 #if DEBUG_SHOW_TEST_NAME
-            SkDebugf("<div id=\"%s\">\n", tests[index].str);
-            SkDebugf("  %s [%s]\n", __FUNCTION__, tests[index].str);
+        SkDebugf("<div id=\"%s\">\n", tests[index].str);
+        SkDebugf("  %s [%s]\n", __FUNCTION__, tests[index].str);
 #endif
-        (*tests[index].fun)(reporter);
+        (*tests[index].fun)(reporter, tests[index].str);
+        if (tests[index].fun == stopTest) {
+            return;
+        }
     }
     index = reverse ? count - 1 : 0;
     size_t last = reverse ? 0 : count - 1;
     do {
         if (tests[index].fun != firstTest) {
     #if DEBUG_SHOW_TEST_NAME
             SkDebugf("<div id=\"%s\">\n", tests[index].str);
             SkDebugf("  %s [%s]\n", __FUNCTION__, tests[index].str);
     #endif
-            (*tests[index].fun)(reporter);
+            (*tests[index].fun)(reporter, tests[index].str);
         }
         if (tests[index].fun == stopTest) {
             SkDebugf("lastTest\n");
+            break;
         }
         if (index == last) {
             break;
         }
         index += reverse ? -1 : 1;
     } while (true);
 }