wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for system jemalloc.

Browse source
This commit is contained in:
wolfbeast 2018-04-26 17:59:36 +02:00 • committed by Roy Tam
commit c76d18a40d
10 changed files with 32 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
memory/build/jemalloc_config.cpp
View file

@ -11,12 +11,8 @@
#include <mozilla/Assertions.h>
#include "mozilla/Types.h"
#if defined(MOZ_SYSTEM_JEMALLOC)
#include MALLOC_H
#else
#define DLLEXPORT
#include "jemalloc/jemalloc.h"
#endif
#ifdef XP_WIN
#include <windows.h>

3
memory/build/moz.build
View file

@ -46,8 +46,7 @@ if CONFIG['MOZ_GLUE_IN_PROGRAM']:
DIST_INSTALL = True
# Keep jemalloc separated when mozglue is statically linked
if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
CONFIG['MOZ_SYSTEM_JEMALLOC']):
if CONFIG['MOZ_MEMORY'] and CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
FINAL_LIBRARY = 'mozglue'
if CONFIG['MOZ_REPLACE_MALLOC'] and CONFIG['OS_TARGET'] == 'Darwin':

6
memory/build/mozjemalloc_compat.c
View file

@ -14,11 +14,7 @@
#include <stdbool.h>
#if defined(MOZ_SYSTEM_JEMALLOC)
# include MALLOC_H
#else
# include "jemalloc/jemalloc.h"
#endif
#include "jemalloc/jemalloc.h"
/*
* CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:

57
memory/build/mozmemory_wrap.h
View file

@ -125,43 +125,38 @@
#include "mozilla/Types.h"
#if !defined(MOZ_SYSTEM_JEMALLOC)
# ifdef MOZ_MEMORY_IMPL
# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC)
# define mozmem_malloc_impl(a) je_ ## a
# define mozmem_jemalloc_impl(a) je_ ## a
# else
# define MOZ_JEMALLOC_API MFBT_API
# ifdef MOZ_REPLACE_JEMALLOC
# define MOZ_MEMORY_API MFBT_API
# define mozmem_malloc_impl(a) replace_ ## a
# define mozmem_jemalloc_impl(a) replace_ ## a
# elif (defined(XP_WIN) || defined(XP_DARWIN))
# if defined(MOZ_REPLACE_MALLOC)
# define mozmem_malloc_impl(a) a ## _impl
# else
# define mozmem_malloc_impl(a) je_ ## a
# endif
#ifdef MOZ_MEMORY_IMPL
# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC)
# define mozmem_malloc_impl(a) je_ ## a
# define mozmem_jemalloc_impl(a) je_ ## a
# else
# define MOZ_JEMALLOC_API MFBT_API
# ifdef MOZ_REPLACE_JEMALLOC
# define MOZ_MEMORY_API MFBT_API
# define mozmem_malloc_impl(a) replace_ ## a
# define mozmem_jemalloc_impl(a) replace_ ## a
# elif (defined(XP_WIN) || defined(XP_DARWIN))
# if defined(MOZ_REPLACE_MALLOC)
# define mozmem_malloc_impl(a) a ## _impl
# else
# define MOZ_MEMORY_API MFBT_API
# if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
# define MOZ_WRAP_NEW_DELETE
# endif
# define mozmem_malloc_impl(a) je_ ## a
# endif
# else
# define MOZ_MEMORY_API MFBT_API
# if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
# define MOZ_WRAP_NEW_DELETE
# endif
# endif
# ifdef XP_WIN
# define mozmem_dup_impl(a) wrap_ ## a
# endif
# endif
/* All other jemalloc3 functions are prefixed with "je_", except when
* building against an unprefixed system jemalloc library */
# define je_(a) je_ ## a
#else /* defined(MOZ_SYSTEM_JEMALLOC) */
# define je_(a) a
# ifdef XP_WIN
# define mozmem_dup_impl(a) wrap_ ## a
# endif
#endif
#if !defined(MOZ_MEMORY_IMPL) || defined(MOZ_SYSTEM_JEMALLOC)
/* All other jemalloc3 functions are prefixed with "je_" */
#define je_(a) je_ ## a
#if !defined(MOZ_MEMORY_IMPL)
# define MOZ_MEMORY_API MFBT_API
# define MOZ_JEMALLOC_API MFBT_API
#endif

4
memory/build/replace_malloc.c
View file

@ -10,10 +10,6 @@
# error Should not compile this file when replace-malloc is disabled
#endif
#ifdef MOZ_SYSTEM_JEMALLOC
# error Should not compile this file when we want to use native jemalloc
#endif
#include "mozmemory_wrap.h"
/* Declare all je_* functions */

3
memory/moz.build
View file

@ -21,8 +21,7 @@ if CONFIG['MOZ_MEMORY']:
]
if CONFIG['MOZ_JEMALLOC4'] or CONFIG['MOZ_REPLACE_MALLOC']:
if not CONFIG['MOZ_SYSTEM_JEMALLOC']:
DIRS += ['jemalloc']
DIRS += ['jemalloc']
if CONFIG['MOZ_REPLACE_MALLOC']:
DIRS += ['replace']