Changeset 48976 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 1, 2009, 9:22:43 AM (16 years ago)

Author:

[email protected]

Message:

2009-10-01 Zoltan Horvath <​[email protected]>

Reviewed by Simon Hausmann.

[Qt] Allow custom memory allocation control for the whole JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=27029

Since in JavaScriptCore almost every class which has been instantiated by operator new is
inherited from FastAllocBase (bug #20422), we disable customizing global operator new for the Qt-port
when USE_SYSTEM_MALLOC=0.

Add #include <unistd.h> to FastMalloc.cpp because it's used by TCMalloc_PageHeap::scavengerThread().
(It's needed for the functionality of TCmalloc.)

Add TCSystemAlloc.cpp to JavaScriptCore.pri if USE_SYSTEM_MALLOC is disabled.

• JavaScriptCore.pri:
• wtf/FastMalloc.cpp: (WTF::sleep):
• wtf/FastMalloc.h:

2009-10-01 Zoltan Horvath <​[email protected]>

Reviewed by Simon Hausmann.

[Qt] Don't use TCmalloc in DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=27029

Add USE_SYSTEM_MALLOC macro to the DRT's profile to avoid using TCmalloc in Qt's DRT.

• DumpRenderTree/qt/DumpRenderTree.pro:

2009-10-01 Zoltan Horvath <​[email protected]>

Reviewed by Simon Hausmann.

[Qt] Enable TCmalloc for the Linux, Mac and Windows Qt-port
​https://bugs.webkit.org/show_bug.cgi?id=27029

Remove USE_SYSTEM_MALLOC for Linux, Mac and Windows Qt-port from WebKit.pri,
so these Qt-ports will use TCmalloc as other ports.

• WebKit.pri:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.pri (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (2 diffs)
• wtf/FastMalloc.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-10-01  Zoltan Horvath  <[email protected]>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Allow custom memory allocation control for the whole JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=27029
+
+        Since in JavaScriptCore almost every class which has been instantiated by operator new is
+        inherited from FastAllocBase (bug #20422), we disable customizing global operator new for the Qt-port
+        when USE_SYSTEM_MALLOC=0.
+
+        Add #include <unistd.h> to FastMalloc.cpp because it's used by TCMalloc_PageHeap::scavengerThread().
+        (It's needed for the functionality of TCmalloc.)
+
+        Add TCSystemAlloc.cpp to JavaScriptCore.pri if USE_SYSTEM_MALLOC is disabled.
+
+        * JavaScriptCore.pri:
+        * wtf/FastMalloc.cpp:
+        (WTF::sleep):
+        * wtf/FastMalloc.h:
+
 2009-09-30  Gabor Loki  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -139 +139 @@
                   runtime/MarkStackPosix.cpp
     }
+}
+
+!contains(DEFINES, USE_SYSTEM_MALLOC) {
+    SOURCES += wtf/TCSystemAlloc.cpp
 }
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -380 +380 @@
 #include <stddef.h>
 #include <stdio.h>
+#if PLATFORM(UNIX)
+#include <unistd.h>
+#endif
 #if COMPILER(MSVC)
 #ifndef WIN32_LEAN_AND_MEAN
@@ -2275 +2278 @@
 
 #if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
-#if PLATFORM(WIN)
+#if PLATFORM(WIN_OS)
 static void sleep(unsigned seconds)
 {

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -214 +214 @@
 // new by accident.
 
+// We musn't customize the global operator new and delete for the Qt port.
+#if !PLATFORM(QT)
+
 WTF_PRIVATE_INLINE void* operator new(size_t size) { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void* operator new(size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
@@ -225 +228 @@
 #endif
 
+#endif
+
 #endif /* WTF_FastMalloc_h */