Changeset 62768 in webkit


Ignore:
Timestamp:
Jul 8, 2010 1:37:06 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-07-08 Sheriff Bot <webkit.review.bot@gmail.com>

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):
Location:
trunk/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r62766 r62768  
     12010-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r62765.
     4        http://trac.webkit.org/changeset/62765
     5        https://bugs.webkit.org/show_bug.cgi?id=41840
     6
     7        All jscore and layout tests crash on Qt bot (Requested by Ossy
     8        on #webkit).
     9
     10        * wtf/FastMalloc.cpp:
     11        (WTF::TCMalloc_PageHeap::initializeScavenger):
     12        (WTF::TCMalloc_PageHeap::signalScavenger):
     13        (WTF::TCMalloc_PageHeap::scavengerThread):
     14
    1152010-07-08  Andreas Kling  <andreas.kling@nokia.com>
    216
  • trunk/JavaScriptCore/wtf/FastMalloc.cpp

    r62765 r62768  
    415415#include "TCSpinLock.h"
    416416#include "TCSystemAlloc.h"
    417 #include "Threading.h"
    418 #include "ThreadSpecific.h"
    419417#include <algorithm>
    420418#include <errno.h>
     
    14451443  bool m_scavengeThreadActive;
    14461444
    1447   Mutex m_scavengeMutex;
    1448   ThreadCondition m_scavengeCondition;
     1445  pthread_mutex_t m_scavengeMutex;
     1446  pthread_cond_t m_scavengeCondition;
    14491447#else // !HAVE(DISPATCH_H)
    14501448  void periodicScavenge();
     
    14921490void TCMalloc_PageHeap::initializeScavenger()
    14931491{
     1492  pthread_mutex_init(&m_scavengeMutex, 0);
     1493  pthread_cond_init(&m_scavengeCondition, 0);
    14941494  m_scavengeThreadActive = true;
    14951495  pthread_t thread;
     
    15091509{
    15101510  if (!m_scavengeThreadActive && shouldScavenge())
    1511     m_scavengeCondition.signal();
     1511    pthread_cond_signal(&m_scavengeCondition);
    15121512}
    15131513
     
    23752375  while (1) {
    23762376      if (!shouldScavenge()) {
    2377           MutexLocker locker(m_scavengeMutex);
     2377          pthread_mutex_lock(&m_scavengeMutex);
    23782378          m_scavengeThreadActive = false;
    23792379          // Block until there are enough free committed pages to release back to the system.
    2380           m_scavengeCondition.wait(m_scavengeMutex);
     2380          pthread_cond_wait(&m_scavengeCondition, &m_scavengeMutex);
    23812381          m_scavengeThreadActive = true;
     2382          pthread_mutex_unlock(&m_scavengeMutex);
    23822383      }
    23832384      sleep(kScavengeDelayInSeconds);
Note: See TracChangeset for help on using the changeset viewer.