Changeset 245260 in webkit

Timestamp:

May 13, 2019 3:42:53 PM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[WTF] Remove Threading workaround for support libraries in Windows
​https://bugs.webkit.org/show_bug.cgi?id=197350

Reviewed by Darin Adler.

We kept old APIs for some support libraries at 2017. This patch removes them.

• wtf/Threading.h:
• wtf/win/ThreadingWin.cpp:

(WTF::createThread): Deleted.
(WTF::waitForThreadCompletion): Deleted.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Threading.h (modified) (3 diffs)
• wtf/win/ThreadingWin.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-05-13  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [WTF] Remove Threading workaround for support libraries in Windows
+        https://bugs.webkit.org/show_bug.cgi?id=197350
+
+        Reviewed by Darin Adler.
+
+        We kept old APIs for some support libraries at 2017. This patch removes them.
+
+        * wtf/Threading.h:
+        * wtf/win/ThreadingWin.cpp:
+        (WTF::createThread): Deleted.
+        (WTF::waitForThreadCompletion): Deleted.
+
 2019-05-13  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/Threading.h

@@ -72 +72 @@
 #endif
 
-// FIXME: The following functions remain because they are used from WebKit Windows support library,
-// WebKitQuartzCoreAdditions.dll. When updating the support library, we should use new API instead
-// and the following workaound should be removed. And new code should not use the following APIs.
-// Remove this workaround code when <rdar://problem/31793213> is fixed.
-#if OS(WINDOWS)
-WTF_EXPORT_PRIVATE ThreadIdentifier createThread(ThreadFunction, void*, const char* threadName);
-WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
-#endif
-
 enum class GCThreadType : uint8_t {
     None = 0,
@@ -91 +82 @@
     friend class ThreadGroup;
     friend WTF_EXPORT_PRIVATE void initializeThreading();
-#if OS(WINDOWS)
-    friend WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
-#endif
 
     WTF_EXPORT_PRIVATE ~Thread();
@@ -370 +358 @@
 using WTF::Thread;
 using WTF::GCThreadType;
-
-#if OS(WINDOWS)
-using WTF::ThreadIdentifier;
-using WTF::createThread;
-using WTF::waitForThreadCompletion;
-#endif

trunk/Source/WTF/wtf/win/ThreadingWin.cpp

@@ -288 +288 @@
 }
 
-// FIXME: Remove this workaround code once <rdar://problem/31793213> is fixed.
 RefPtr<Thread> Thread::get(ThreadIdentifier id)
 {
@@ -428 +427 @@
 }
 
-// Remove this workaround code when <rdar://problem/31793213> is fixed.
-ThreadIdentifier createThread(ThreadFunction function, void* data, const char* threadName)
-{
-    return Thread::create(threadName, [function, data] {
-        function(data);
-    })->id();
-}
-
-int waitForThreadCompletion(ThreadIdentifier threadID)
-{
-    // This function is implemented based on the old Threading implementation.
-    // It remains only due to the support library using old Threading APIs and
-    // it should not be used in new code.
-    ASSERT(threadID);
-
-    RefPtr<Thread> thread = Thread::get(threadID);
-    if (!thread) {
-        LOG_ERROR("ThreadIdentifier %u did not correspond to an active thread when trying to quit", threadID);
-        return WAIT_FAILED;
-    }
-    return thread->waitForCompletion();
-
-}
-
 void Thread::yield()
 {