Changeset 238361 in webkit

Timestamp:

Nov 18, 2018 4:50:21 AM (5 years ago)

Author:

yusukesuzuki@slowstart.org

Message:

Use Box<BinarySemaphore> instead of dispatch_semaphore_t
​https://bugs.webkit.org/show_bug.cgi?id=189691

Reviewed by Ryosuke Niwa.

Use Box<BinarySemaphore> instead, which utilizes our WTF::Lock mechanism.

• NetworkProcess/watchos/NetworkProximityManager.mm:

(WebKit::NetworkProximityManager::updateRecommendation):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/watchos/NetworkProximityManager.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-18  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
+
+        Use Box<BinarySemaphore> instead of dispatch_semaphore_t
+        https://bugs.webkit.org/show_bug.cgi?id=189691
+
+        Reviewed by Ryosuke Niwa.
+
+        Use Box<BinarySemaphore> instead, which utilizes our WTF::Lock mechanism.
+
+        * NetworkProcess/watchos/NetworkProximityManager.mm:
+        (WebKit::NetworkProximityManager::updateRecommendation):
+
 2018-11-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/watchos/NetworkProximityManager.mm

@@ -36 +36 @@
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockPtr.h>
+#import <wtf/Box.h>
 #import <wtf/CompletionHandler.h>
 #import <wtf/cf/TypeCastsCF.h>
+#import <wtf/threads/BinarySemaphore.h>
 
 WTF_DECLARE_CF_TYPE_TRAIT(SCNetworkInterface);
@@ -299 +301 @@
     RELEASE_LOG(ProximityNetworking, "Requesting an immediate recommendation from iRATManager.");
 
-    auto semaphore = adoptOSObject(dispatch_semaphore_create(0));
+    auto semaphore = Box<BinarySemaphore>::create();
     [m_iRATInterface getProximityLinkRecommendation:NO recommendation:[this, semaphore](NSArray<WRM_iRATProximityRecommendation *> *recommendations) {
         processRecommendations(recommendations);
-        dispatch_semaphore_signal(semaphore.get());
+        semaphore->signal();
     }];
-
-    dispatch_semaphore_wait(semaphore.get(), dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC));
+    semaphore->waitFor(1_s);
 }