Clang/Mac build fix after r108119
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Feb 2012 22:31:14 +0000 (22:31 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Feb 2012 22:31:14 +0000 (22:31 +0000)
Source/WebKit2:

* WebProcess/WebProcess.cpp:
(WebKit::randomCrashThread): Annotate this function with NO_RETURN_DUE_TO_CRASH.

Tools:

Mac build fix after r108119

* DumpRenderTree/mac/DumpRenderTree.mm:
(runThread):
(runPthread):
(testThreadIdentifierMap):
Updated to match current WTF threading APIs.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebProcess.cpp
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index cc2d7ab..9796a69 100644 (file)
@@ -1,3 +1,10 @@
+2012-02-17  Adam Roben  <aroben@apple.com>
+
+        Clang build fix after r108119
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::randomCrashThread): Annotate this function with NO_RETURN_DUE_TO_CRASH.
+
 2012-02-17  Kalev Lember  <kalevlember@gmail.com>
 
         Remove unused parameters from WTF threading API
index 2cf2af2..9a8b905 100644 (file)
@@ -100,7 +100,8 @@ static void sleep(unsigned seconds)
 }
 #endif
 
-static void randomCrashThread(void*)
+static void randomCrashThread(void*) NO_RETURN_DUE_TO_CRASH;
+void randomCrashThread(void*)
 {
     // This delay was chosen semi-arbitrarily. We want the crash to happen somewhat quickly to
     // enable useful stress testing, but not so quickly that the web process will always crash soon
index eaf83de..890fd40 100644 (file)
@@ -1,3 +1,13 @@
+2012-02-17  Adam Roben  <aroben@apple.com>
+
+        Mac build fix after r108119
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (runThread):
+        (runPthread):
+        (testThreadIdentifierMap):
+        Updated to match current WTF threading APIs.
+
 2012-02-17  Dirk Pranke  <dpranke@chromium.org>
 
         revert r107147 - breaks webkit-patch on Mac SL
index fb8c66a..3c3b181 100644 (file)
@@ -681,13 +681,18 @@ static void setDefaultsToConsistentValuesForTesting()
     [WebPreferences _switchNetworkLoaderToNewTestingSession];
 }
 
-static void* runThread(void* arg)
+static void runThread(void* arg)
 {
     static ThreadIdentifier previousId = 0;
     ThreadIdentifier currentId = currentThread();
     // Verify 2 successive threads do not get the same Id.
     ASSERT(previousId != currentId);
     previousId = currentId;
+}
+
+static void* runPthread(void* arg)
+{
+    runThread(arg);
     return 0;
 }
 
@@ -695,10 +700,10 @@ static void testThreadIdentifierMap()
 {
     // Imitate 'foreign' threads that are not created by WTF.
     pthread_t pthread;
-    pthread_create(&pthread, 0, &runThread, 0);
+    pthread_create(&pthread, 0, &runPthread, 0);
     pthread_join(pthread, 0);
 
-    pthread_create(&pthread, 0, &runThread, 0);
+    pthread_create(&pthread, 0, &runPthread, 0);
     pthread_join(pthread, 0);
 
     // Now create another thread using WTF. On OSX, it will have the same pthread handle