Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 154A684FCB for ; Wed, 31 May 2023 21:04:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id EwOWHtcDm4z8 for ; Wed, 31 May 2023 21:04:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 734EC84CCA for ; Wed, 31 May 2023 21:04:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70489FA87; Wed, 31 May 2023 21:04:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1685567057112710" MIME-Version: 1.0 Date: Wed, 31 May 2023 17:04:17 -0400 From: "Christos Zoulas" Subject: CVS commit: pkgsrc/devel/jemalloc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: christos@netbsd.org X-Mailer: log_accum Message-Id: <20230531210417.70489FA87@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1685567057112710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: christos Date: Wed May 31 21:04:17 UTC 2023 Modified Files: pkgsrc/devel/jemalloc: Makefile distinfo Added Files: pkgsrc/devel/jemalloc/patches: patch-src_pages.c Log Message: Fix for over-alignment bug from Andreas Gustafsson To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/jemalloc/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/jemalloc/distinfo cvs rdiff -u -r0 -r1.7 pkgsrc/devel/jemalloc/patches/patch-src_pages.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1685567057112710 Content-Disposition: inline Content-Length: 2870 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/jemalloc/Makefile diff -u pkgsrc/devel/jemalloc/Makefile:1.22 pkgsrc/devel/jemalloc/Makefile:1.23 --- pkgsrc/devel/jemalloc/Makefile:1.22 Mon Sep 26 14:02:21 2022 +++ pkgsrc/devel/jemalloc/Makefile Wed May 31 17:04:17 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2022/09/26 18:02:21 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2023/05/31 21:04:17 christos Exp $ DISTNAME= jemalloc-5.3.0 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=jemalloc/} GITHUB_RELEASE= ${PKGVERSION_NOREV} Index: pkgsrc/devel/jemalloc/distinfo diff -u pkgsrc/devel/jemalloc/distinfo:1.18 pkgsrc/devel/jemalloc/distinfo:1.19 --- pkgsrc/devel/jemalloc/distinfo:1.18 Mon Sep 26 16:32:19 2022 +++ pkgsrc/devel/jemalloc/distinfo Wed May 31 17:04:17 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2022/09/26 20:32:19 wiz Exp $ +$NetBSD: distinfo,v 1.19 2023/05/31 21:04:17 christos Exp $ BLAKE2s (jemalloc-5.3.0.tar.bz2) = 285e6145b9d3b575b1ec5cfdae8af40b461149085f001839d64685c0d56e2689 SHA512 (jemalloc-5.3.0.tar.bz2) = 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1 @@ -6,3 +6,4 @@ Size (jemalloc-5.3.0.tar.bz2) = 736023 b SHA1 (patch-Makefile.in) = 502b7b8b80429c3db15ef001dad04805824a9a98 SHA1 (patch-configure) = 5dec3fb5b2ece549e40743780db3057dd83cc17e SHA1 (patch-include_jemalloc_internal_quantum.h) = e291b59958813fc1af28bea0a5a63d5715090a48 +SHA1 (patch-src_pages.c) = a2b9589def01d941e2fe65b30f5f9faf059d8833 Added files: Index: pkgsrc/devel/jemalloc/patches/patch-src_pages.c diff -u /dev/null pkgsrc/devel/jemalloc/patches/patch-src_pages.c:1.7 --- /dev/null Wed May 31 17:04:17 2023 +++ pkgsrc/devel/jemalloc/patches/patch-src_pages.c Wed May 31 17:04:17 2023 @@ -0,0 +1,32 @@ +$NetBSD: patch-src_pages.c,v 1.7 2023/05/31 21:04:17 christos Exp $ + +Don't affect global state when making alignment modifications to the +mmap flags. + +diff --git a/src/pages.c b/src/pages.c +index 09b51b88..2d5b8164 100644 +--- src/pages.c ++++ src/pages.c +@@ -155,6 +155,7 @@ os_pages_map(void *addr, size_t size, size_t alignment, bool *commit) { + * of existing mappings, and we only want to create new mappings. + */ + { ++ int flags = mmap_flags; + #ifdef __NetBSD__ + /* + * On NetBSD PAGE for a platform is defined to the +@@ -164,12 +165,12 @@ os_pages_map(void *addr, size_t size, size_t alignment, bool *commit) { + */ + if (alignment > os_page || PAGE > os_page) { + unsigned int a = ilog2(MAX(alignment, PAGE)); +- mmap_flags |= MAP_ALIGNED(a); ++ flags |= MAP_ALIGNED(a); + } + #endif + int prot = *commit ? PAGES_PROT_COMMIT : PAGES_PROT_DECOMMIT; + +- ret = mmap(addr, size, prot, mmap_flags, PAGES_FD_TAG, 0); ++ ret = mmap(addr, size, prot, flags, PAGES_FD_TAG, 0); + } + assert(ret != NULL); + --_----------=_1685567057112710--