Changeset 225667 in webkit

Timestamp:

Dec 7, 2017 7:02:26 PM (6 years ago)

Author:

Yusuke Suzuki

Message:

Use WTF::RecursiveLockAdapter instead of using pthread_mutex_t with recursive lock option
​https://bugs.webkit.org/show_bug.cgi?id=180449

Reviewed by Mark Lam.

Use WTF::RecursiveLockAdapter<StaticLock> instead. We can remove pthread_mutex_xxx,
pthread_once and FontLocker wrapper.

• platform/graphics/FontCache.cpp:

(WebCore::FontCache::getCachedFontPlatformData):
(WebCore::FontCache::fontForPlatformData):
(WebCore::FontCache::purgeInactiveFontData):
(WebCore::FontCache::inactiveFontCount):
(initFontCacheLockOnce): Deleted.
(FontLocker::FontLocker): Deleted.
(FontLocker::~FontLocker): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-07  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Use WTF::RecursiveLockAdapter instead of using pthread_mutex_t with recursive lock option
+        https://bugs.webkit.org/show_bug.cgi?id=180449
+
+        Reviewed by Mark Lam.
+
+        Use WTF::RecursiveLockAdapter<StaticLock> instead. We can remove pthread_mutex_xxx,
+        pthread_once and FontLocker wrapper.
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore::FontCache::getCachedFontPlatformData):
+        (WebCore::FontCache::fontForPlatformData):
+        (WebCore::FontCache::purgeInactiveFontData):
+        (WebCore::FontCache::inactiveFontCount):
+        (initFontCacheLockOnce): Deleted.
+        (FontLocker::FontLocker): Deleted.
+        (FontLocker::~FontLocker): Deleted.
+
 2017-12-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -51 +51 @@
 
 #if PLATFORM(IOS)
-#include <wtf/Noncopyable.h>
-
-// FIXME: We may be able to simplify this code using C++11 threading primitives, including std::call_once().
-static pthread_mutex_t fontLock;
-
-static void initFontCacheLockOnce()
-{
-    pthread_mutexattr_t mutexAttribute;
-    pthread_mutexattr_init(&mutexAttribute);
-    pthread_mutexattr_settype(&mutexAttribute, PTHREAD_MUTEX_RECURSIVE);
-    pthread_mutex_init(&fontLock, &mutexAttribute);
-    pthread_mutexattr_destroy(&mutexAttribute);
-}
-
-static pthread_once_t initFontLockControl = PTHREAD_ONCE_INIT;
-
-class FontLocker {
-    WTF_MAKE_NONCOPYABLE(FontLocker);
-public:
-    FontLocker()
-    {
-        pthread_once(&initFontLockControl, initFontCacheLockOnce);
-        int lockcode = pthread_mutex_lock(&fontLock);
-        ASSERT_WITH_MESSAGE_UNUSED(lockcode, !lockcode, "fontLock lock failed with code:%d", lockcode);    
-    }
-    ~FontLocker()
-    {
-        int lockcode = pthread_mutex_unlock(&fontLock);
-        ASSERT_WITH_MESSAGE_UNUSED(lockcode, !lockcode, "fontLock unlock failed with code:%d", lockcode);
-    }
-};
+#include <wtf/Lock.h>
+#include <wtf/RecursiveLockAdapter.h>
+
+using RecursiveStaticLock = WTF::RecursiveLockAdapter<StaticLock>;
+static RecursiveStaticLock fontLock;
+
 #endif // PLATFORM(IOS)
 
@@ -233 +208 @@
 {
 #if PLATFORM(IOS)
-    FontLocker fontLocker;
+    auto locker = holdLock(fontLock);
 #endif
     
@@ -361 +336 @@
 {
 #if PLATFORM(IOS)
-    FontLocker fontLocker;
+    auto locker = holdLock(fontLock);
 #endif
     
@@ -394 +369 @@
 
 #if PLATFORM(IOS)
-    FontLocker fontLocker;
+    auto locker = holdLock(fontLock);
 #endif
 
@@ -438 +413 @@
 {
 #if PLATFORM(IOS)
-    FontLocker fontLocker;
+    auto locker = holdLock(fontLock);
 #endif
     unsigned count = 0;