Bug 418016 - "Ts jumped ~1% when enabling jemalloc on Linux (qm-mini-ubuntu01, qm-mini-ubuntu02, qm-mini-ubuntu05)" (Integrate jemalloc into libxul on Linux) [p=jasone@canonware.com (Jason Evans) r=bsmedberg sr+a1.9=stuart]

browser/app/Makefile.in

@@ -73,7 +73,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBX
 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
 
 ifdef MOZ_MEMORY
-ifneq ($(OS_ARCH),WINNT)
+ifeq ($(OS_ARCH),Darwin)
 LIBS += -ljemalloc
 endif
 endif

browser/installer/removed-files.in

@@ -589,6 +589,7 @@ res/bloatcycle.html
 #ifndef XP_MACOSX
 readme.txt
 chrome/icons/default/default.xpm
+libjemalloc.so
 #endif
 #endif
 dictionaries/PL.dic

browser/installer/unix/packages-static

@@ -51,7 +51,6 @@ bin/run-mozilla.sh
 bin/plugins/libnullplugin.so
 bin/libsqlite3.so
 bin/README.txt
-bin/libjemalloc.so
 
 ; [Components]
 bin/components/alerts.xpt

memory/jemalloc/Makefile.in

@@ -81,11 +81,18 @@ libs:: $(WIN32_CUSTOM_CRT_DIR)/mozcrt19.dll
 endif
 
 else
-# for other platforms, just build jemalloc as a shared lib
 
 MODULE_OPTIMIZE_FLAGS = -O2
 LIBRARY_NAME	= jemalloc
+
+ifeq (Darwin,$(OS_TARGET))
+# Build jemalloc as a shared lib, so that the library init function is executed.
 FORCE_SHARED_LIB= 1
+else
+# Make jemalloc part of libxul, in order to reduce dynamic loading overhead.
+MODULE		= jemalloc
+LIBXUL_LIBRARY	= 1
+endif
 
 CSRCS		= \
 		jemalloc.c \

toolkit/library/Makefile.in

@@ -249,3 +249,11 @@ endif
 ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
 DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
 endif
+
+ifdef MOZ_MEMORY
+ifneq ($(OS_ARCH),WINNT)
+ifneq ($(OS_ARCH),Darwin)
+EXTRA_DSO_LDOPTS += $(DEPTH)/memory/jemalloc/$(LIB_PREFIX)jemalloc.$(LIB_SUFFIX)
+endif
+endif
+endif