gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sys-fs/bees: Rebased musl patch for -9999

Browse Source 
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Kai Krakow <kai@kaishome.de>
Closes: https://github.com/gentoo/gentoo/pull/18968
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Kai Krakow
2021-01-06 20:57:46 +01:00
committed by Joonas Niilola
parent 9f15ebb836
commit 816bbe8553
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-fs/bees/bees-9999.ebuild
View File

@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~BTRFS_FS"
ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
PATCHES=( "${FILESDIR}/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
pkg_pretend() {
if [[ ${MERGE_TYPE} != buildonly ]]; then

50
sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch Normal file
View File

@@ -0,0 +1,50 @@
From 02bdb636be5abd15836e5e43e9b53517595686c9 Mon Sep 17 00:00:00 2001
From: Kai Krakow <kai@kaishome.de>
Date: Thu, 16 Apr 2020 21:21:57 +0200
Subject: [PATCH v9999] HACK: musl does not define pthread_getname_np()
The glibc alternative musl does not define this setter function. This
fix is probably wrong because it resets the thread names used for
logging internally to empty strings.
Link: https://www.openwall.com/lists/musl/2019/07/17/3
Signed-off-by: Kai Krakow <kai@kaishome.de>
---
lib/task.cc | 2 ++
src/bees.cc | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lib/task.cc b/lib/task.cc
index 937a477..85da59b 100644
--- a/lib/task.cc
+++ b/lib/task.cc
@@ -194,7 +194,9 @@ namespace crucible {
lock.unlock();
char buf[24] = { 0 };
+#ifdef _GNU_SOURCE
DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf)));
+#endif
DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str()));
sched_param param = { .sched_priority = 0 };
diff --git a/src/bees.cc b/src/bees.cc
index 03a626c..3db5d73 100644
--- a/src/bees.cc
+++ b/src/bees.cc
@@ -152,10 +152,12 @@ BeesNote::get_name()
// OK try the pthread name next.
char buf[24];
memset(buf, '\0', sizeof(buf));
+#ifdef _GNU_SOURCE
int err = pthread_getname_np(pthread_self(), buf, sizeof(buf));
if (err) {
return string("pthread_getname_np: ") + strerror(err);
}
+#endif
buf[sizeof(buf) - 1] = '\0';
// thread_getname_np returns process name
--
2.26.2