From owner-svn-src-all@freebsd.org Wed Aug 9 22:58:43 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 762B2DD7B35; Wed, 9 Aug 2017 22:58:43 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 425EE63C36; Wed, 9 Aug 2017 22:58:43 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v79Mwg2u048248; Wed, 9 Aug 2017 22:58:42 GMT (envelope-from rlibby@FreeBSD.org) Received: (from rlibby@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v79Mwg0o048246; Wed, 9 Aug 2017 22:58:42 GMT (envelope-from rlibby@FreeBSD.org) Message-Id: <201708092258.v79Mwg0o048246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rlibby set sender to rlibby@FreeBSD.org using -f From: Ryan Libby Date: Wed, 9 Aug 2017 22:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r322332 - in head: contrib/jemalloc/include/jemalloc/internal contrib/jemalloc/src lib/libc/stdlib/jemalloc X-SVN-Group: head X-SVN-Commit-Author: rlibby X-SVN-Commit-Paths: in head: contrib/jemalloc/include/jemalloc/internal contrib/jemalloc/src lib/libc/stdlib/jemalloc X-SVN-Commit-Revision: 322332 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2017 22:58:43 -0000 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