logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 03ff506c35e0aeaa208e38b9e98991dc869ab017
parent 386e887e8e66cb8f140df748a00b63fe9ef38ee0
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  6 Jul 2021 16:03:13 -0700

musl: Cherry-pick patch adding pthread_getname_np

Diffstat:

Apkg/musl/patch/0002-add-pthread_getname_np-function.patch58++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpkg/musl/ver2+-
2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/pkg/musl/patch/0002-add-pthread_getname_np-function.patch b/pkg/musl/patch/0002-add-pthread_getname_np-function.patch @@ -0,0 +1,58 @@ +From ffc49274d11cd77d0b6f92f6581f70e58871d370 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Rolim?= <ericonr@disroot.org> +Date: Tue, 20 Apr 2021 16:15:15 -0300 +Subject: [PATCH] add pthread_getname_np function + +based on the pthread_setname_np implementation +--- + include/pthread.h | 1 + + src/thread/pthread_getname_np.c | 25 +++++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + create mode 100644 src/thread/pthread_getname_np.c + +diff --git a/include/pthread.h b/include/pthread.h +index 0492f26a..89fd9ff7 100644 +--- a/include/pthread.h ++++ b/include/pthread.h +@@ -221,6 +221,7 @@ int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *); + int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *); + int pthread_getattr_np(pthread_t, pthread_attr_t *); + int pthread_setname_np(pthread_t, const char *); ++int pthread_getname_np(pthread_t, char *, size_t); + int pthread_getattr_default_np(pthread_attr_t *); + int pthread_setattr_default_np(const pthread_attr_t *); + int pthread_tryjoin_np(pthread_t, void **); +diff --git a/src/thread/pthread_getname_np.c b/src/thread/pthread_getname_np.c +new file mode 100644 +index 00000000..48d1a294 +--- /dev/null ++++ b/src/thread/pthread_getname_np.c +@@ -0,0 +1,25 @@ ++#define _GNU_SOURCE ++#include <fcntl.h> ++#include <unistd.h> ++#include <sys/prctl.h> ++ ++#include "pthread_impl.h" ++ ++int pthread_getname_np(pthread_t thread, char *name, size_t len) ++{ ++ int fd, cs, status = 0; ++ char f[sizeof "/proc/self/task//comm" + 3*sizeof(int)]; ++ ++ if (len < 16) return ERANGE; ++ ++ if (thread == pthread_self()) ++ return prctl(PR_GET_NAME, (unsigned long)name, 0UL, 0UL, 0UL) ? errno : 0; ++ ++ snprintf(f, sizeof f, "/proc/self/task/%d/comm", thread->tid); ++ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); ++ if ((fd = open(f, O_RDONLY|O_CLOEXEC)) < 0 || (len = read(fd, name, len)) < 0) status = errno; ++ else name[len-1] = 0; /* remove trailing new line only if successful */ ++ if (fd >= 0) close(fd); ++ pthread_setcancelstate(cs, 0); ++ return status; ++} +-- +2.32.0 + diff --git a/pkg/musl/ver b/pkg/musl/ver @@ -1 +1 @@ -1.2.2 r1 +1.2.2 r2