Changeset 62768 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Jul 8, 2010, 1:37:06 AM (15 years ago)

Author:

[email protected]

Message:

2010-07-08 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r62765.
​http://trac.webkit.org/changeset/62765
​https://bugs.webkit.org/show_bug.cgi?id=41840

All jscore and layout tests crash on Qt bot (Requested by Ossy
on #webkit).

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

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

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