Author: rlibby
Date: Wed Aug 9 22:58:42 2017
New Revision: 322332
URL: https://svnweb.freebsd.org/changeset/base/322332
Log:
Pick 'Remove external linkage for spin_adaptive' from upstream jemalloc
Apply the changes from upstream jemalloc 048c6679. This is actually not
quite a cherry pick due to makefile difference and because FreeBSD does
not carry the msvc project files which were also modified in that
commit.
Approved by: jasone (maintainer), markj (mentor)
Sponsored by: Dell EMC Isilon
Deleted:
head/contrib/jemalloc/src/spin.c
Modified:
head/contrib/jemalloc/include/jemalloc/internal/spin.h
head/lib/libc/stdlib/jemalloc/Makefile.inc
Modified: head/contrib/jemalloc/include/jemalloc/internal/spin.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/spin.h Wed Aug 9
22:18:49 2017 (r322331)
+++ head/contrib/jemalloc/include/jemalloc/internal/spin.h Wed Aug 9
22:58:42 2017 (r322332)
@@ -1,19 +1,13 @@
#ifndef JEMALLOC_INTERNAL_SPIN_H
#define JEMALLOC_INTERNAL_SPIN_H
-#ifdef JEMALLOC_SPIN_C_
-# define SPIN_INLINE extern inline
-#else
-# define SPIN_INLINE inline
-#endif
-
#define SPIN_INITIALIZER {0U}
typedef struct {
unsigned iteration;
} spin_t;
-SPIN_INLINE void
+static inline void
spin_adaptive(spin_t *spin) {
volatile uint32_t i;
Modified: head/lib/libc/stdlib/jemalloc/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/jemalloc/Makefile.inc Wed Aug 9 22:18:49 2017
(r322331)
+++ head/lib/libc/stdlib/jemalloc/Makefile.inc Wed Aug 9 22:58:42 2017
(r322332)
@@ -5,7 +5,7 @@
JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bitmap.c ckh.c \
ctl.c extent.c extent_dss.c extent_mmap.c hash.c hooks.c large.c \
malloc_io.c mutex.c mutex_pool.c nstime.c pages.c prng.c prof.c \
- rtree.c spin.c stats.c sz.c tcache.c ticker.c tsd.c witness.c
+ rtree.c stats.c sz.c tcache.c ticker.c tsd.c witness.c
SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
