Add thread-per-core setting to SkThreadPool.

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"
@@ skipping 495 matching lines @@
     scaledOut.setFillType(out.getFillType());
     int result = comparePaths(reporter, pathOut, scaledPathOut, out, scaledOut, bitmap, a, b,
                               shapeOp, scale);
     if (result && gPathStrAssert) {
         REPORTER_ASSERT(reporter, 0);
     }
     reporter->bumpTestCount();
     return result == 0;
 }
 
-const int maxThreadsAllocated = 64;
-static int maxThreads = 1;
-
 int initializeTests(skiatest::Reporter* reporter, const char* test) {
 #ifdef SK_DEBUG
     gDebugMaxWindSum = 4;
     gDebugMaxWindValue = 4;
 #endif
     testName = test;
     size_t testNameSize = strlen(test);
-    if (reporter->allowThreaded()) {
-        int threads = -1;
-#ifdef SK_BUILD_FOR_MAC
-        size_t size = sizeof(threads);
-        sysctlbyname("hw.logicalcpu_max", &threads, &size, NULL, 0);
-#endif
-        if (threads > 0) {
-            maxThreads = threads;
-        } else {
-            maxThreads = 16;
-        }
-    }
     SkFILEStream inFile("../../experimental/Intersection/op.htm");
     if (inFile.isValid()) {
         SkTDArray<char> inData;
         inData.setCount(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;
         }
     }
-    return maxThreads;
+    return reporter->allowThreaded() ? SkThreadPool::kThreadPerCore : 0;

[caryclark, 2013/04/19 18:37:12]

Are 0 and 1 interchangeable? The old code returned 1 if no threads were allowed.

[mtklein, 2013/04/19 18:52:59]

Very similar.  1 will spawn a new thread and run all calls there.  0 makes the
calls immediately on the current thread.  Seemed to me like 0 was the spirit of
!allowThreaded().

 }
 
 void outputProgress(char* ramStr, const char* pathStr, SkPath::FillType pathFillType) {
     const char testFunction[] = "testSimplify(path);";
     const char* pathPrefix = NULL;
     const char* nameSuffix = NULL;
     if (pathFillType == SkPath::kEvenOdd_FillType) {
         pathPrefix = "    path.setFillType(SkPath::kEvenOdd_FillType);\n";
         nameSuffix = "x";
     }
@@ skipping 36 matching lines @@
         }
         if (tests[index].fun == stopTest) {
             SkDebugf("lastTest\n");
         }
         if (index == last) {
             break;
         }
         index += reverse ? -1 : 1;
     } while (true);
 }