41b6afb834
Use FreeBSD-specific functions (_pthread_mutex_init_calloc_cb(),
_malloc_{pre,post}fork()) to avoid bootstrapping issues due to
allocation in libc and libthr.
Add malloc_strtoumax() and use it instead of strtoul(). Disable
validation code in malloc_vsnprintf() and malloc_strtoumax() until
jemalloc is initialized. This is necessary because locale
initialization causes allocation for both vsnprintf() and strtoumax().
Force the lazy-lock feature on in order to avoid pthread_self(),
because it causes allocation.
Use syscall(SYS_write, ...) rather than write(...), because libthr wraps
write() and causes allocation. Without this workaround, it would not be
possible to print error messages in malloc_conf_init() without
substantially reworking bootstrapping.
Fix choose_arena_hard() to look at how many threads are assigned to the
candidate choice, rather than checking whether the arena is
uninitialized. This bug potentially caused more arenas to be
initialized than necessary.
92 lines
2.3 KiB
C
92 lines
2.3 KiB
C
/******************************************************************************/
|
|
#ifdef JEMALLOC_H_TYPES
|
|
|
|
#ifdef JEMALLOC_OSSPIN
|
|
typedef OSSpinLock malloc_mutex_t;
|
|
#define MALLOC_MUTEX_INITIALIZER 0
|
|
#else
|
|
typedef pthread_mutex_t malloc_mutex_t;
|
|
# if (defined(PTHREAD_MUTEX_ADAPTIVE_NP) && \
|
|
defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP))
|
|
# define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_ADAPTIVE_NP
|
|
# define MALLOC_MUTEX_INITIALIZER PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
# else
|
|
# define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT
|
|
# define MALLOC_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
|
|
# endif
|
|
#endif
|
|
|
|
#endif /* JEMALLOC_H_TYPES */
|
|
/******************************************************************************/
|
|
#ifdef JEMALLOC_H_STRUCTS
|
|
|
|
#endif /* JEMALLOC_H_STRUCTS */
|
|
/******************************************************************************/
|
|
#ifdef JEMALLOC_H_EXTERNS
|
|
|
|
#ifdef JEMALLOC_LAZY_LOCK
|
|
extern bool isthreaded;
|
|
#else
|
|
# define isthreaded true
|
|
#endif
|
|
|
|
bool malloc_mutex_init(malloc_mutex_t *mutex);
|
|
void malloc_mutex_prefork(malloc_mutex_t *mutex);
|
|
void malloc_mutex_postfork_parent(malloc_mutex_t *mutex);
|
|
void malloc_mutex_postfork_child(malloc_mutex_t *mutex);
|
|
|
|
#endif /* JEMALLOC_H_EXTERNS */
|
|
/******************************************************************************/
|
|
#ifdef JEMALLOC_H_INLINES
|
|
|
|
#ifndef JEMALLOC_ENABLE_INLINE
|
|
void malloc_mutex_lock(malloc_mutex_t *mutex);
|
|
bool malloc_mutex_trylock(malloc_mutex_t *mutex);
|
|
void malloc_mutex_unlock(malloc_mutex_t *mutex);
|
|
#endif
|
|
|
|
#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_MUTEX_C_))
|
|
JEMALLOC_INLINE void
|
|
malloc_mutex_lock(malloc_mutex_t *mutex)
|
|
{
|
|
|
|
if (isthreaded) {
|
|
#ifdef JEMALLOC_OSSPIN
|
|
OSSpinLockLock(mutex);
|
|
#else
|
|
pthread_mutex_lock(mutex);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
JEMALLOC_INLINE bool
|
|
malloc_mutex_trylock(malloc_mutex_t *mutex)
|
|
{
|
|
|
|
if (isthreaded) {
|
|
#ifdef JEMALLOC_OSSPIN
|
|
return (OSSpinLockTry(mutex) == false);
|
|
#else
|
|
return (pthread_mutex_trylock(mutex) != 0);
|
|
#endif
|
|
} else
|
|
return (false);
|
|
}
|
|
|
|
JEMALLOC_INLINE void
|
|
malloc_mutex_unlock(malloc_mutex_t *mutex)
|
|
{
|
|
|
|
if (isthreaded) {
|
|
#ifdef JEMALLOC_OSSPIN
|
|
OSSpinLockUnlock(mutex);
|
|
#else
|
|
pthread_mutex_unlock(mutex);
|
|
#endif
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#endif /* JEMALLOC_H_INLINES */
|
|
/******************************************************************************/
|