2008-01-11 Alp Toker <alp@atoker.com>

        Reviewed by Oliver Hunt.

        Enable FastMalloc by default in GTK+/autotools and add a configure
        switch.

        * GNUmakefile.am:
        * configure.ac:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29429 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3d18132c62f841bc819264a1b31e01ef2dae70f8..ab7ba0fecee8a73bfd3e3ac5cf1f85471766c147 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-11  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Oliver Hunt.
+
+        Enable FastMalloc by default in GTK+/autotools and add a configure
+        switch.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2008-01-11  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index aa6419efbc5a836dbaacc76708b7cb80fd9f76f2..95eb1fb05be5beb534d61ab723015ed4a581aa06 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -165,9 +165,13 @@ libWebKitGtk_la_LDFLAGS := \
 # Extra checks and flags
 global_cppflags += \
        -DBUILDING_GTK__=1 \
-       -DUSE_SYSTEM_MALLOC \
        -DWTF_CHANGES
 
+if !ENABLE_FAST_MALLOC
+global_cppflags += \
+       -DUSE_SYSTEM_MALLOC
+endif
+
 if TARGET_X11
 global_cppflags += -DXP_UNIX
 endif

diff --git a/configure.ac b/configure.ac
index 2b334212aa8f29c890e90478292440c866c67de1..74ac277d12643cc2830a6cb57b31503c4eaaa616 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,14 @@ AC_ARG_ENABLE(coverage,
               [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 
+# check whether to enable FastMalloc
+AC_MSG_CHECKING([whether to enable optimized memory allocator])
+AC_ARG_ENABLE(fast_malloc,
+              AC_HELP_STRING([--enable-fast-malloc],
+                             [enable optimized memory allocator default=yes, default=no for debug builds]),
+              [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
+AC_MSG_RESULT([$enable_fast_malloc])
+
 # Add '-g' flag to gcc if it's debug build
 if test "$enable_debug" = "yes"; then
    CXXFLAGS="$CXXFLAGS -g"
@@ -351,6 +359,7 @@ AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
+AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 
 AC_CONFIG_FILES([
@@ -367,6 +376,7 @@ WebKit was configured with the following options:
  Target                            : $with_webkit_target
  Enable debug                      : $enable_debug
  Code coverage support             : $enable_coverage
+ Optimized memory allocator        : $enable_fast_malloc
  HTML5 client-side storage support : $enable_database
  HTML5 video element support       : $enable_video
  Icon database support             : $enable_icon_database