Changeset 25422 in webkit

Timestamp:

Sep 7, 2007, 12:42:47 PM (17 years ago)

Author:

darin

Message:

Reviewed by Steve Falkenburg.

• fix crash seen on Windows release builds

• wtf/FastMalloc.cpp: Change pthread_getspecific optimization to be done only on the DARWIN platform. Also correct a couple reinterpret_cast that should be static_cast instead.

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-09-07  Darin Adler  <darin@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        - fix crash seen on Windows release builds
+
+        * wtf/FastMalloc.cpp: Change pthread_getspecific optimization to be done only
+        on the DARWIN platform. Also correct a couple reinterpret_cast that should be
+        static_cast instead.
+
 2007-09-06  Kevin McCullough  <kmccullough@apple.com>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -193 +193 @@
 
 #if WTF_CHANGES
+
 #if PLATFORM(DARWIN)
 #include "MallocZoneSupport.h"
+#endif
+
+// Calling pthread_getspecific through a global function pointer is faster than a normal
+// call to the function on Mac OS X, and it's used in performance-critical code. So we
+// use a function pointer. But that's not necessarily faster on other platforms, and we had
+// problems with this technique on Windows, so we'll do this only on Mac OS X.
+#if PLATFORM(DARWIN)
+static void* (*pthread_getspecific_function_pointer)(pthread_key_t) = pthread_getspecific;
+#define pthread_getspecific(key) pthread_getspecific_function_pointer(key)
 #endif
 
@@ -1283 +1293 @@
 static bool tsd_inited = false;
 static pthread_key_t heap_key;
-static void* (*FM_pthread_getspecific)(pthread_key_t) = pthread_getspecific;
 
 // Allocator for thread heaps
@@ -1553 +1562 @@
     InitModule();
   } else {
-    ptr = FM_pthread_getspecific(heap_key);
+    ptr = pthread_getspecific(heap_key);
   }
   if (ptr == NULL) ptr = CreateCacheIfNecessary();
-  return reinterpret_cast<TCMalloc_ThreadCache*>(ptr);
+  return static_cast<TCMalloc_ThreadCache*>(ptr);
 }
 
@@ -1564 +1573 @@
 inline TCMalloc_ThreadCache* TCMalloc_ThreadCache::GetCacheIfPresent() {
   if (!tsd_inited) return NULL;
-  return reinterpret_cast<TCMalloc_ThreadCache*>
-    (FM_pthread_getspecific(heap_key));
+  return static_cast<TCMalloc_ThreadCache*>(pthread_getspecific(heap_key));
 }
 
@@ -1681 +1689 @@
   // Remove all memory from heap
   TCMalloc_ThreadCache* heap;
-  heap = reinterpret_cast<TCMalloc_ThreadCache*>(ptr);
+  heap = static_cast<TCMalloc_ThreadCache*>(ptr);
   heap->Cleanup();