Changeset 130622 in webkit

Timestamp:

Oct 8, 2012, 1:06:50 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r130619.
​http://trac.webkit.org/changeset/130619
​https://bugs.webkit.org/show_bug.cgi?id=98634

Causes many crashes on the EFL bots. (Requested by rakuco on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-10-08

Source/WebCore:

• platform/RunLoop.h:

(RunLoop):

• platform/efl/RunLoopEfl.cpp:

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

Source/WTF:

• wtf/efl/MainThreadEfl.cpp:

(WTF::pipeObject):
(WTF):
(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  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r130619.
+        http://trac.webkit.org/changeset/130619
+        https://bugs.webkit.org/show_bug.cgi?id=98634
+
+        Causes many crashes on the EFL bots. (Requested by rakuco on
+        #webkit).
+
+        * wtf/efl/MainThreadEfl.cpp:
+        (WTF::pipeObject):
+        (WTF):
+        (WTF::monitorDispatchFunctions):
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+
 2012-10-08  Byungwoo Lee  <bw80.lee@samsung.com>
 

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

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r130619.
+        http://trac.webkit.org/changeset/130619
+        https://bugs.webkit.org/show_bug.cgi?id=98634
+
+        Causes many crashes on the EFL bots. (Requested by rakuco on
+        #webkit).
+
+        * platform/RunLoop.h:
+        (RunLoop):
+        * platform/efl/RunLoopEfl.cpp:
+        (WebCore::RunLoop::RunLoop):
+        (WebCore::RunLoop::wakeUpEvent):
+        (WebCore::RunLoop::wakeUp):
+
 2012-10-08  Byungwoo Lee  <bw80.lee@samsung.com>
 

trunk/Source/WebCore/platform/RunLoop.h

@@ -168 +168 @@
 #elif PLATFORM(EFL)
     bool m_initEfl;
-    static void wakeUpEvent(void* data);
+    OwnPtr<Ecore_Pipe> m_pipe;
+    static void wakeUpEvent(void* data, void*, unsigned int);
 #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 {
 
@@ -60 +63 @@
     }
 
+    m_pipe = adoptPtr(ecore_pipe_add(wakeUpEvent, this));
     m_initEfl = true;
 
@@ -92 +96 @@
 }
 
-void RunLoop::wakeUpEvent(void* data)
+void RunLoop::wakeUpEvent(void* data, void*, unsigned int)
 {
     static_cast<RunLoop*>(data)->performWork();
@@ -99 +103 @@
 void RunLoop::wakeUp()
 {
-    ecore_main_loop_thread_safe_call_async(wakeUpEvent, this);
+    ecore_pipe_write(m_pipe.get(), wakupEcorePipeMessage, ecorePipeMessageSize);
 }