ext/{libxml,openssl}: jemalloc support

Author: MaxKellermann

configure.ac

@@ -953,6 +953,20 @@ AS_VAR_IF([PHP_DMALLOC], [yes],
       AS_VAR_APPEND([CPPFLAGS], [" -DDMALLOC_FUNC_CHECK"])],
     [AC_MSG_FAILURE([The dmalloc check failed. Cannot enable dmalloc.])])])
 
+PHP_ARG_ENABLE([jemalloc],
+  [whether to enable jemalloc],
+  [AS_HELP_STRING([--enable-jemalloc],
+    [Enable jemalloc])],
+  [no],
+  [no])
+
+if test "$PHP_JEMALLOC" = "yes"; then
+  PKG_CHECK_MODULES([JEMALLOC], [jemalloc],, [AC_MSG_ERROR([jemalloc not found])])
+  AC_DEFINE(HAVE_JEMALLOC, 1, [Whether you have jemalloc])
+  PHP_EVAL_LIBLINE($JEMALLOC_LIBS)
+  PHP_EVAL_INCLINE($JEMALLOC_CFLAGS)
+fi
+
 PHP_ARG_ENABLE([ipv6],
   [whether to enable IPv6 support],
   [AS_HELP_STRING([--disable-ipv6],

ext/libxml/libxml.c

@@ -43,6 +43,10 @@
 #include <libxml/xmlschemas.h>
 #endif
 
+#ifdef HAVE_JEMALLOC
+#include <jemalloc/jemalloc.h>
+#endif // HAVE_JEMALLOC
+
 #include "php_libxml.h"
 
 #define PHP_LIBXML_LOADED_VERSION ((char *)xmlParserVersion)
@@ -901,9 +905,27 @@ static void php_libxml_exports_dtor(zval *zv)
 	free(Z_PTR_P(zv));
 }
 
+#ifdef HAVE_JEMALLOC
+
+static char *
+je_xmlMemStrdup(const char *src)
+{
+	const size_t size = strlen(src) + 1;
+	char *dest = je_malloc(size);
+	if (dest != NULL)
+		memcpy(dest, src, size);
+	return dest;
+}
+
+#endif // HAVE_JEMALLOC
+
 PHP_LIBXML_API void php_libxml_initialize(void)
 {
 	if (!_php_libxml_initialized) {
+#ifdef HAVE_JEMALLOC
+		xmlMemSetup(je_free, je_malloc, je_realloc, je_xmlMemStrdup);
+#endif
+
 		/* we should be the only one's to ever init!! */
 		ZEND_IGNORE_LEAKS_BEGIN();
 		xmlInitParser();

ext/openssl/openssl.c

@@ -69,6 +69,10 @@
 /* Common */
 #include <time.h>
 
+#ifdef HAVE_JEMALLOC
+#include <jemalloc/jemalloc.h>
+#endif // HAVE_JEMALLOC
+
 #if (defined(PHP_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1900)
 #define timezone _timezone	/* timezone is called _timezone in LibC */
 #endif
@@ -1249,6 +1253,37 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
+#ifdef HAVE_JEMALLOC
+
+static void *
+je_CRYPTO_malloc(size_t num, const char *file, int line)
+{
+	(void)file;
+	(void)line;
+
+	return je_malloc(num);
+}
+
+static void *
+je_CRYPTO_realloc(void *addr, size_t num, const char *file, int line)
+{
+	(void)file;
+	(void)line;
+
+	return je_realloc(addr, num);
+}
+
+static void
+je_CRYPTO_free(void *addr, const char *file, int line)
+{
+	(void)file;
+	(void)line;
+
+	je_free(addr);
+}
+
+#endif // HAVE_JEMALLOC
+
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(openssl)
 {
@@ -1287,6 +1322,10 @@ PHP_MINIT_FUNCTION(openssl)
 	php_openssl_pkey_object_handlers.clone_obj = NULL;
 	php_openssl_pkey_object_handlers.compare = zend_objects_not_comparable;
 
+#ifdef HAVE_JEMALLOC
+	CRYPTO_set_mem_functions(je_CRYPTO_malloc, je_CRYPTO_realloc, je_CRYPTO_free);
+#endif // HAVE_JEMALLOC
+
 #ifdef LIBRESSL_VERSION_NUMBER
 	OPENSSL_config(NULL);
 	SSL_library_init();