Changeset 142163 in webkit

Timestamp:

Feb 7, 2013 12:35:09 PM (4 years ago)

Author:

benjamin@webkit.org

Message:

Upstream iOS isWebThread() and isUIThread()
​https://bugs.webkit.org/show_bug.cgi?id=109130

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-02-07
Reviewed by Sam Weinig.

Source/WebCore:

• bindings/objc/WebScriptObject.mm:

(+[WebScriptObject initialize]):

• platform/mac/SharedBufferMac.mm:

(+[WebCoreSharedBufferData initialize]):
#ifdef out the legacy initialization as it is not correct when
using a WebThread.

Source/WTF:

On iOS, it is sometimes necessary to differenciate the thread running WebCore,
and the thread running the UI. This patch upstream those functions.

• wtf/MainThread.cpp:
• wtf/MainThread.h:

Disable the legacy initializer as it is incorrect when using the WebThread to run WebCore.
(WTF::isWebThread):
(WTF::isUIThread):
Return true when the current thread is the Web/UI thread.

• wtf/mac/MainThreadMac.mm:

(WTF::isUIThread):
(WTF::isWebThread):

• wtf/text/AtomicString.cpp:

(WTF::AtomicStringTable::create):
Use the newly added methods.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MainThread.cpp (modified) (2 diffs)
• WTF/wtf/MainThread.h (modified) (2 diffs)
• WTF/wtf/mac/MainThreadMac.mm (modified) (3 diffs)
• WTF/wtf/text/AtomicString.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/objc/WebScriptObject.mm (modified) (1 diff)
• WebCore/platform/mac/SharedBufferMac.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-02-07  Benjamin Poulain  <bpoulain@apple.com>
+
+        Upstream iOS isWebThread() and isUIThread()
+        https://bugs.webkit.org/show_bug.cgi?id=109130
+
+        Reviewed by Sam Weinig.
+
+        On iOS, it is sometimes necessary to differenciate the thread running WebCore,
+        and the thread running the UI. This patch upstream those functions.
+
+        * wtf/MainThread.cpp:
+        * wtf/MainThread.h:
+        Disable the legacy initializer as it is incorrect when using the WebThread to run WebCore.
+        (WTF::isWebThread):
+        (WTF::isUIThread):
+        Return true when the current thread is the Web/UI thread.
+
+        * wtf/mac/MainThreadMac.mm:
+        (WTF::isUIThread):
+        (WTF::isWebThread):
+
+        * wtf/text/AtomicString.cpp:
+        (WTF::AtomicStringTable::create):
+        Use the newly added methods.
+
 2013-02-07  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WTF/wtf/MainThread.cpp

@@ -121 +121 @@
 }
 
+#if !USE(WEB_THREAD)
 static void initializeMainThreadToProcessMainThreadOnce()
 {
@@ -131 +132 @@
     pthread_once(&initializeMainThreadKeyOnce, initializeMainThreadToProcessMainThreadOnce);
 }
+#endif // !USE(WEB_THREAD)
+
 #endif
 

trunk/Source/WTF/wtf/MainThread.h

@@ -52 +52 @@
 WTF_EXPORT_PRIVATE bool isMainThread();
 
+#if USE(WEB_THREAD)
+WTF_EXPORT_PRIVATE bool isWebThread();
+WTF_EXPORT_PRIVATE bool isUIThread();
+#else
+inline bool isWebThread() { return isMainThread(); }
+inline bool isUIThread() { return isMainThread(); }
+#endif // PLATFORM(IOS)
+
+
 void initializeGCThreads();
 
@@ -69 +78 @@
 
 #if PLATFORM(MAC)
+#if !USE(WEB_THREAD)
 // This version of initializeMainThread sets up the main thread as corresponding
 // to the process's main thread, and not necessarily the thread that calls this
 // function. It should only be used as a legacy aid for Mac WebKit.
 WTF_EXPORT_PRIVATE void initializeMainThreadToProcessMainThread();
+#endif // !USE(WEB_THREAD)
 void initializeMainThreadToProcessMainThreadPlatform();
 #endif

trunk/Source/WTF/wtf/mac/MainThreadMac.mm

@@ -71 +71 @@
 }
 
+#if !USE(WEB_THREAD)
 void initializeMainThreadToProcessMainThreadPlatform()
 {
@@ -85 +86 @@
     initializeGCThreads();
 }
+#endif // !USE(WEB_THREAD)
 
 static void timerFired(CFRunLoopTimerRef timer, void*)
@@ -134 +136 @@
 }
 
+#if USE(WEB_THREAD)
+bool isUIThread()
+{
+    return pthread_main_np();
+}
+
+bool isWebThread()
+{
+    return pthread_equal(pthread_self(), mainThreadPthread);
+}
+#endif // USE(WEB_THREAD)
+
 } // namespace WTF

trunk/Source/WTF/wtf/text/AtomicString.cpp

@@ -75 +75 @@
 
         bool currentThreadIsWebThread = isWebThread();
-        if (currentThreadIsWebThread || pthread_main_np())
+        if (currentThreadIsWebThread || isUIThread())
             data.m_atomicStringTable = sharedStringTable;
         else

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-07  Benjamin Poulain  <bpoulain@apple.com>
+
+        Upstream iOS isWebThread() and isUIThread()
+        https://bugs.webkit.org/show_bug.cgi?id=109130
+
+        Reviewed by Sam Weinig.
+
+        * bindings/objc/WebScriptObject.mm:
+        (+[WebScriptObject initialize]):
+        * platform/mac/SharedBufferMac.mm:
+        (+[WebCoreSharedBufferData initialize]):
+        #ifdef out the legacy initialization as it is not correct when
+        using a WebThread.
+
 2013-02-07  Vivek Galatage  <vivek.vg@samsung.com>
 

trunk/Source/WebCore/bindings/objc/WebScriptObject.mm

@@ -128 +128 @@
 + (void)initialize
 {
+#if !USE(WEB_THREAD)
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
+#endif // !USE(WEB_THREAD)
     WebCoreObjCFinalizeOnMainThread(self);
 }

trunk/Source/WebCore/platform/mac/SharedBufferMac.mm

@@ -48 +48 @@
 + (void)initialize
 {
+#if !USE(WEB_THREAD)
     JSC::initializeThreading();
 #if PLATFORM(QT) && USE(QTKIT)
@@ -54 +55 @@
     WTF::initializeMainThreadToProcessMainThread();
 #endif
+#endif // !USE(WEB_THREAD)
     WebCoreObjCFinalizeOnMainThread(self);
 }