Changeset 181308 in webkit

Timestamp:

Mar 9, 2015 9:21:42 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Build fix for Windows after r181305.
​https://webkit.org/b/142513>

Reviewed by Alex Christensen.

Windows doesn't like pthreads anymore. Changed test to use WTF threading.

• API/tests/CompareAndSwapTest.cpp:

(setBitThreadFunc):
(testCompareAndSwap):

Location:

trunk/Source/JavaScriptCore

Files:

• API/tests/CompareAndSwapTest.cpp (modified) (5 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp

@@ -27 +27 @@
 
 #include <stdio.h>
-#include <thread>
 #include <wtf/Atomics.h>
+#include <wtf/Threading.h>
 
 // Regression test for webkit.org/b/142513
@@ -76 +76 @@
 };
 
-static void* setBitThreadFunc(void* p)
+static void setBitThreadFunc(void* p)
 {
     Data* data = reinterpret_cast<Data*>(p);
@@ -93 +93 @@
 
     printf("   finished Thread %d\n", data->id);
-    pthread_exit(nullptr);
 }
 
@@ -100 +99 @@
     Bitmap bitmap;
     const int numThreads = 5;
-    pthread_t threadIDs[numThreads];
+    ThreadIdentifier threadIDs[numThreads];
     Data data[numThreads];
     
@@ -108 +107 @@
         data[i].id = i;
         data[i].numThreads = numThreads;
-        pthread_create(&threadIDs[i], 0, &setBitThreadFunc, &data[i]);
+        std::function<void()> threadFunc = std::bind(setBitThreadFunc, &data[i]);
+        threadIDs[i] = createThread("setBitThreadFunc", threadFunc);
     }
 
     printf("Waiting for %d threads to join\n", numThreads);
     for (int i = 0; i < numThreads; i++)
-        pthread_join(threadIDs[i], nullptr);
+        waitForThreadCompletion(threadIDs[i]);
 
     printf("PASS: CompareAndSwap test completed without a hang\n");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-09  Mark Lam  <mark.lam@apple.com>
+
+        Build fix for Windows after r181305.
+        https://webkit.org/b/142513>
+
+        Reviewed by Alex Christensen.
+
+        Windows doesn't like pthreads anymore.  Changed test to use WTF threading.
+
+        * API/tests/CompareAndSwapTest.cpp:
+        (setBitThreadFunc):
+        (testCompareAndSwap):
+
 2015-03-09  Mark Lam  <mark.lam@apple.com>