d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pick 'Remove external linkage for spin_adaptive' from upstream jemalloc

Browse Source 
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
This commit is contained in:
Ryan Libby 2017-08-09 22:58:42 +00:00
parent b284b46dc4
commit 20100e740e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=322332
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/jemalloc/include/jemalloc/internal/spin.h
View File

@ -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;

4
contrib/jemalloc/src/spin.c
View File

@ -1,4 +0,0 @@
#define JEMALLOC_SPIN_C_
#include "jemalloc/internal/jemalloc_preamble.h"
#include "jemalloc/internal/spin.h"

2
lib/libc/stdlib/jemalloc/Makefile.inc
View File

@ -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