Changeset 130619 in webkit

Timestamp:

Oct 8, 2012, 12:20:17 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Use ecore_main_loop_thread_safe_call_async() to wakeup main loop.
​https://bugs.webkit.org/show_bug.cgi?id=98505

Patch by Byungwoo Lee <​bw80.lee@samsung.com> on 2012-10-08
Reviewed by Kenneth Rohde Christiansen.

Instead of ecore_pipe_write(),
use ecore_main_loop_thread_safe_call_async() to wakeup ecore main loop.

According to the EFL API document, this function is designed to dispatch
a function on ecore main loop by avoiding dead lock or race condition.
With this function, webkit doesn't need to maintain ecore pipe also.

Source/WebCore:

No new tests. The function to wakeup main loop is changed.

• platform/RunLoop.h:

(RunLoop):

• platform/efl/RunLoopEfl.cpp:

(WebCore::RunLoop::RunLoop):
(WebCore::RunLoop::wakeUpEvent):
(WebCore::RunLoop::wakeUp):

Source/WTF:

• wtf/efl/MainThreadEfl.cpp:

(WTF::monitorDispatchFunctions):
(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/efl/MainThreadEfl.cpp (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/RunLoop.h (modified) (1 diff)
• WebCore/platform/efl/RunLoopEfl.cpp (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-10-08  Byungwoo Lee  <bw80.lee@samsung.com>
+
+        [EFL] Use ecore_main_loop_thread_safe_call_async() to wakeup main loop.
+        https://bugs.webkit.org/show_bug.cgi?id=98505
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Instead of ecore_pipe_write(),
+        use ecore_main_loop_thread_safe_call_async() to wakeup ecore main loop.
+
+        According to the EFL API document, this function is designed to dispatch
+        a function on ecore main loop by avoiding dead lock or race condition. 
+        With this function, webkit doesn't need to maintain ecore pipe also.
+
+        * wtf/efl/MainThreadEfl.cpp:
+        (WTF::monitorDispatchFunctions):
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+
 2012-10-07  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WTF/wtf/efl/MainThreadEfl.cpp

@@ -42 +42 @@
 namespace WTF {
 
-static OwnPtr<Ecore_Pipe>& pipeObject()
-{
-    DEFINE_STATIC_LOCAL(OwnPtr<Ecore_Pipe>, pipeObject, ());
-    return pipeObject;
-}
-
-static void monitorDispatchFunctions(void*, void*, unsigned int)
+static void monitorDispatchFunctions(void*)
 {
     dispatchFunctionsFromMainThread();
@@ -55 +49 @@
 void initializeMainThreadPlatform()
 {
-    pipeObject() = adoptPtr(ecore_pipe_add(monitorDispatchFunctions, 0));
 }
 
 void scheduleDispatchFunctionsOnMainThread()
 {
-    ecore_pipe_write(pipeObject().get(), "", 0);
+    ecore_main_loop_thread_safe_call_async(monitorDispatchFunctions, 0);
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Byungwoo Lee  <bw80.lee@samsung.com>
+
+        [EFL] Use ecore_main_loop_thread_safe_call_async() to wakeup main loop.
+        https://bugs.webkit.org/show_bug.cgi?id=98505
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Instead of ecore_pipe_write(),
+        use ecore_main_loop_thread_safe_call_async() to wakeup ecore main loop.
+
+        According to the EFL API document, this function is designed to dispatch
+        a function on ecore main loop by avoiding dead lock or race condition. 
+        With this function, webkit doesn't need to maintain ecore pipe also.
+
+        No new tests. The function to wakeup main loop is changed.
+
+        * platform/RunLoop.h:
+        (RunLoop):
+        * platform/efl/RunLoopEfl.cpp:
+        (WebCore::RunLoop::RunLoop):
+        (WebCore::RunLoop::wakeUpEvent):
+        (WebCore::RunLoop::wakeUp):
+
 2012-10-07  Arpita Bahuguna  <arpitabahuguna@gmail.com>
 

trunk/Source/WebCore/platform/RunLoop.h

@@ -168 +168 @@
 #elif PLATFORM(EFL)
     bool m_initEfl;
-    OwnPtr<Ecore_Pipe> m_pipe;
-    static void wakeUpEvent(void* data, void*, unsigned int);
+    static void wakeUpEvent(void* data);
 #endif
 };

trunk/Source/WebCore/platform/efl/RunLoopEfl.cpp

@@ -35 +35 @@
 #include <wtf/PassOwnPtr.h>
 
-static const int ecorePipeMessageSize = 1;
-static const char wakupEcorePipeMessage[] = "W";
-
 namespace WebCore {
 
@@ -63 +60 @@
     }
 
-    m_pipe = adoptPtr(ecore_pipe_add(wakeUpEvent, this));
     m_initEfl = true;
 
@@ -96 +92 @@
 }
 
-void RunLoop::wakeUpEvent(void* data, void*, unsigned int)
+void RunLoop::wakeUpEvent(void* data)
 {
     static_cast<RunLoop*>(data)->performWork();
@@ -103 +99 @@
 void RunLoop::wakeUp()
 {
-    ecore_pipe_write(m_pipe.get(), wakupEcorePipeMessage, ecorePipeMessageSize);
+    ecore_main_loop_thread_safe_call_async(wakeUpEvent, this);
 }