From a16240228263665d1e5dea15d9a0f41753a39105 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Mon, 9 Nov 2009 14:58:12 -0800 Subject: [PATCH] Fix configure docs (--enable-lazy-lock --> --disable-lazy-lock). Fix some style nits. Ignore the jemalloc/bin directory. --- .hgignore | 1 + jemalloc/configure.ac | 2 +- jemalloc/src/jemalloc.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.hgignore b/.hgignore index ef78dd52..5b5761f3 100644 --- a/.hgignore +++ b/.hgignore @@ -2,6 +2,7 @@ syntax: glob syntax: regexp ^jemalloc/autom4te\.cache +^jemalloc/bin$ ^jemalloc/cfg(hdrs|outputs)\.stamp$ ^jemalloc/config\.(log|status)$ ^jemalloc/configure$ diff --git a/jemalloc/configure.ac b/jemalloc/configure.ac index a37d3cfb..f4d78ac2 100644 --- a/jemalloc/configure.ac +++ b/jemalloc/configure.ac @@ -523,7 +523,7 @@ AC_SUBST([roff_tls]) dnl Enable lazy locking by default. AC_ARG_ENABLE([lazy_lock], - [AS_HELP_STRING([--enable-lazy-lock], + [AS_HELP_STRING([--disable-lazy-lock], [Disable lazy locking (always lock, even when single-threaded)])], [if test "x$enable_lazy_lock" = "xno" ; then enable_lazy_lock="0" diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c index 410c0c45..dcba9100 100644 --- a/jemalloc/src/jemalloc.c +++ b/jemalloc/src/jemalloc.c @@ -1341,7 +1341,7 @@ pthread_create(pthread_t *restrict thread, const pthread_attr_t *restrict attr, pthread_once(&once_control, get_pthread_create_fptr); isthreaded = true; - return pthread_create_fptr(thread, attr, start_routine, arg); + return (pthread_create_fptr(thread, attr, start_routine, arg)); } #endif @@ -2426,8 +2426,8 @@ arena_run_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) } /* Wrap red-black tree macros in functions. */ -rb_wrap(static JEMALLOC_UNUSED, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t, - link, arena_run_comp) +rb_wrap(static JEMALLOC_UNUSED, arena_run_tree_, arena_run_tree_t, + arena_chunk_map_t, link, arena_run_comp) static inline int arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b)