Title: [124356] trunk/Source/WTF
- Revision
- 124356
- Author
- [email protected]
- Date
- 2012-08-01 12:41:27 -0700 (Wed, 01 Aug 2012)
Log Message
Fix FastMalloc build with assertions enabled.
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_PageHeap::isScavengerSuspended):
(WTF::TCMalloc_PageHeap::scheduleScavenger):
(WTF::TCMalloc_PageHeap::suspendScavenger):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (124355 => 124356)
--- trunk/Source/WTF/ChangeLog 2012-08-01 19:24:58 UTC (rev 124355)
+++ trunk/Source/WTF/ChangeLog 2012-08-01 19:41:27 UTC (rev 124356)
@@ -1,5 +1,14 @@
2012-08-01 Patrick Gansterer <[email protected]>
+ Fix FastMalloc build with assertions enabled.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::TCMalloc_PageHeap::isScavengerSuspended):
+ (WTF::TCMalloc_PageHeap::scheduleScavenger):
+ (WTF::TCMalloc_PageHeap::suspendScavenger):
+
+2012-08-01 Patrick Gansterer <[email protected]>
+
Export StringImpl::sizeInBytes() with WTF_EXPORT_STRING_API
https://bugs.webkit.org/show_bug.cgi?id=92851
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (124355 => 124356)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-01 19:24:58 UTC (rev 124355)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-01 19:41:27 UTC (rev 124356)
@@ -1564,7 +1564,7 @@
ALWAYS_INLINE bool TCMalloc_PageHeap::isScavengerSuspended()
{
- ASSERT(IsHeld(pageheap_lock));
+ ASSERT(pageheap_lock.IsHeld());
return !m_scavengeQueueTimer;
}
@@ -1572,7 +1572,7 @@
{
// We need to use WT_EXECUTEONLYONCE here and reschedule the timer, because
// Windows will fire the timer event even when the function is already running.
- ASSERT(IsHeld(pageheap_lock));
+ ASSERT(pageheap_lock.IsHeld());
CreateTimerQueueTimer(&m_scavengeQueueTimer, 0, scavengerTimerFired, this, kScavengeDelayInSeconds * 1000, 0, WT_EXECUTEONLYONCE);
}
@@ -1585,7 +1585,7 @@
ALWAYS_INLINE void TCMalloc_PageHeap::suspendScavenger()
{
- ASSERT(IsHeld(pageheap_lock));
+ ASSERT(pageheap_lock.IsHeld());
HANDLE scavengeQueueTimer = m_scavengeQueueTimer;
m_scavengeQueueTimer = 0;
DeleteTimerQueueTimer(0, scavengeQueueTimer, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
