Changeset 48731 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 24, 2009, 2:15:22 PM (16 years ago)

Author:

[email protected]

Message:

Fix FastMalloc to build with assertions enabled.

Reviewed by Gavin Barraclough.

• wtf/FastMalloc.cpp:

(WTF::TCMalloc_Central_FreeList::ReleaseToSpans):

• wtf/TCSpinLock.h:

(TCMalloc_SpinLock::IsHeld):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (1 diff)
• wtf/TCSpinLock.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-24  Mark Rowe  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix FastMalloc to build with assertions enabled.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_Central_FreeList::ReleaseToSpans):
+        * wtf/TCSpinLock.h:
+        (TCMalloc_SpinLock::IsHeld):
+
 2009-09-24  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -2389 +2389 @@
   if (false) {
     // Check that object does not occur in list
-    int got = 0;
+    unsigned got = 0;
     for (void* p = span->objects; p != NULL; p = *((void**) p)) {
       ASSERT(p != object);

trunk/JavaScriptCore/wtf/TCSpinLock.h

@@ -210 +210 @@
     if (pthread_mutex_unlock(&private_lock_) != 0) CRASH();
   }
+  bool IsHeld() {
+    if (pthread_mutex_trylock(&private_lock_))
+      return true;
+
+    Unlock();
+    return false;
+  }
 };