Changeset 270661 in webkit

Timestamp:

Dec 10, 2020 4:17:23 PM (3 years ago)

Author:

ggaren@apple.com

Message:

Unreviewed, re-landing r270132.

Regression test failures have been resolved.

Re-landed changeset:

"Use a Version 1 CFRunLoopSource for faster task dispatch"
​https://bugs.webkit.org/show_bug.cgi?id=202874
​https://trac.webkit.org/changeset/270132

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/RunLoop.h (modified) (1 diff)
• Source/WTF/wtf/cf/RunLoopCF.cpp (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/cocoa/UtilitiesCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-12-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Unreviewed, re-landing r270132.
+
+        Regression test failures have been resolved.
+
+        Re-landed changeset:
+
+        "Use a Version 1 CFRunLoopSource for faster task dispatch"
+        https://bugs.webkit.org/show_bug.cgi?id=202874
+        https://trac.webkit.org/changeset/270132
+
 2020-12-10  Dean Jackson  <dino@apple.com>
 

trunk/Source/WTF/wtf/RunLoop.h

@@ -228 +228 @@
     Lock m_loopLock;
 #elif USE(COCOA_EVENT_LOOP)
-    static void performWork(void*);
+    static void performWork(CFMachPortRef, void* msg, CFIndex size, void* info);
     RetainPtr<CFRunLoopRef> m_runLoop;
     RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
+    RetainPtr<CFMachPortRef> m_port;
 #elif USE(GLIB_EVENT_LOOP)
     void notify(Event, const char*);

trunk/Source/WTF/wtf/cf/RunLoopCF.cpp

@@ -29 +29 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <dispatch/dispatch.h>
+#include <mach/mach.h>
 #include <wtf/AutodrainedPool.h>
 #include <wtf/SchedulePair.h>
@@ -41 +42 @@
 }
 
-void RunLoop::performWork(void* context)
+void RunLoop::performWork(CFMachPortRef, void*, CFIndex, void* info)
 {
     AutodrainedPool pool;
-    static_cast<RunLoop*>(context)->performWork();
+    static_cast<RunLoop*>(info)->performWork();
 }
 
@@ -50 +51 @@
     : m_runLoop(CFRunLoopGetCurrent())
 {
-    CFRunLoopSourceContext context = { 0, this, 0, 0, 0, 0, 0, 0, 0, performWork };
-    m_runLoopSource = adoptCF(CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context));
+    CFMachPortContext context = { 0, this, nullptr, nullptr, nullptr };
+    m_port = adoptCF(CFMachPortCreate(kCFAllocatorDefault, performWork, &context, nullptr));
+    m_runLoopSource = adoptCF(CFMachPortCreateRunLoopSource(kCFAllocatorDefault, m_port.get(), 0));
     CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopCommonModes);
 }
@@ -57 +59 @@
 RunLoop::~RunLoop()
 {
+    CFMachPortInvalidate(m_port.get());
     CFRunLoopSourceInvalidate(m_runLoopSource.get());
 }
@@ -62 +65 @@
 void RunLoop::wakeUp()
 {
-    CFRunLoopSourceSignal(m_runLoopSource.get());
-    CFRunLoopWakeUp(m_runLoop.get());
+    mach_msg_header_t header;
+    header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
+    header.msgh_size = sizeof(mach_msg_header_t);
+    header.msgh_remote_port = CFMachPortGetPort(m_port.get());
+    header.msgh_local_port = MACH_PORT_NULL;
+    header.msgh_id = 0;
+    mach_msg_return_t result = mach_msg(&header, MACH_SEND_MSG | MACH_SEND_TIMEOUT, header.msgh_size, 0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
+    RELEASE_ASSERT(result == MACH_MSG_SUCCESS || result == MACH_SEND_TIMED_OUT);
+    if (result == MACH_SEND_TIMED_OUT)
+        mach_msg_destroy(&header);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-12-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Unreviewed, re-landing r270132.
+
+        Regression test failures have been resolved.
+
+        Re-landed changeset:
+
+        "Use a Version 1 CFRunLoopSource for faster task dispatch"
+        https://bugs.webkit.org/show_bug.cgi?id=202874
+        https://trac.webkit.org/changeset/270132
+
 2020-12-10  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Tools/TestWebKitAPI/cocoa/UtilitiesCocoa.mm

@@ -39 +39 @@
 {
     for (uint64_t i = 0; i < count; ++i)
-        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+        while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true) == kCFRunLoopRunHandledSource) { }
 }