Changeset 62765 in webkit

Timestamp:

Jul 8, 2010 12:38:29 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-08 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Geoffrey Garen.

Make FastMalloc more portable.
​https://bugs.webkit.org/show_bug.cgi?id=41790

Use WTF::Mutex instead of pthread_mutex_t and
replace pthread_cond_t with WTF::ThreadCondition.

• wtf/FastMalloc.cpp: (WTF::TCMalloc_PageHeap::initializeScavenger): (WTF::TCMalloc_PageHeap::signalScavenger): (WTF::TCMalloc_PageHeap::scavengerThread):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-08  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Make FastMalloc more portable.
+        https://bugs.webkit.org/show_bug.cgi?id=41790
+
+        Use WTF::Mutex instead of pthread_mutex_t and
+        replace pthread_cond_t with WTF::ThreadCondition.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::initializeScavenger):
+        (WTF::TCMalloc_PageHeap::signalScavenger):
+        (WTF::TCMalloc_PageHeap::scavengerThread):
+
 2010-07-08  Patrick Gansterer  <paroga@paroga.com>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -415 +415 @@
 #include "TCSpinLock.h"
 #include "TCSystemAlloc.h"
+#include "Threading.h"
+#include "ThreadSpecific.h"
 #include <algorithm>
 #include <errno.h>
@@ -1443 +1445 @@
   bool m_scavengeThreadActive;
 
-  pthread_mutex_t m_scavengeMutex;
-  pthread_cond_t m_scavengeCondition;
+  Mutex m_scavengeMutex;
+  ThreadCondition m_scavengeCondition;
 #else // !HAVE(DISPATCH_H)
   void periodicScavenge();
@@ -1490 +1492 @@
 void TCMalloc_PageHeap::initializeScavenger()
 {
-  pthread_mutex_init(&m_scavengeMutex, 0);
-  pthread_cond_init(&m_scavengeCondition, 0);
   m_scavengeThreadActive = true;
   pthread_t thread;
@@ -1509 +1509 @@
 {
   if (!m_scavengeThreadActive && shouldScavenge())
-    pthread_cond_signal(&m_scavengeCondition);
+    m_scavengeCondition.signal();
 }
 
@@ -2375 +2375 @@
   while (1) {
       if (!shouldScavenge()) {
-          pthread_mutex_lock(&m_scavengeMutex);
+          MutexLocker locker(m_scavengeMutex);
           m_scavengeThreadActive = false;
           // Block until there are enough free committed pages to release back to the system.
-          pthread_cond_wait(&m_scavengeCondition, &m_scavengeMutex);
+          m_scavengeCondition.wait(m_scavengeMutex);
           m_scavengeThreadActive = true;
-          pthread_mutex_unlock(&m_scavengeMutex);
       }
       sleep(kScavengeDelayInSeconds);