From ddc6a0dbe71602964216b173694540af17917065 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 5 Nov 2022 11:33:12 -0700 Subject: [PATCH] musl: add support for SIGEV_THREAD_ID timers https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb --- ...d-support-for-SIGEV_THREAD_ID-timers.patch | 74 +++++++++++++++++++ srcpkgs/musl/template | 2 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch diff --git a/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch b/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch new file mode 100644 index 00000000000..e20dff5ba0d --- /dev/null +++ b/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch @@ -0,0 +1,74 @@ +From 7c71792e87691451f2a6b76348e83ad1889f1dcb Mon Sep 17 00:00:00 2001 +From: James Y Knight +Date: Sun, 30 Jun 2019 21:55:20 -0400 +Subject: [PATCH] add support for SIGEV_THREAD_ID timers + +This is like SIGEV_SIGNAL, but targeted to a particular thread's +tid, rather than the process. +--- + include/signal.h | 16 +++++++++++++--- + src/time/timer_create.c | 8 ++++++-- + 2 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/include/signal.h b/include/signal.h +index fbdf667b2..9ed929e4f 100644 +--- a/include/signal.h ++++ b/include/signal.h +@@ -180,14 +180,24 @@ struct sigevent { + union sigval sigev_value; + int sigev_signo; + int sigev_notify; +- void (*sigev_notify_function)(union sigval); +- pthread_attr_t *sigev_notify_attributes; +- char __pad[56-3*sizeof(long)]; ++ union { ++ char __pad[64 - 2*sizeof(int) - sizeof(union sigval)]; ++ pid_t sigev_notify_thread_id; ++ struct { ++ void (*sigev_notify_function)(union sigval); ++ pthread_attr_t *sigev_notify_attributes; ++ } __sev_thread; ++ } __sev_fields; + }; + ++#define sigev_notify_thread_id __sev_fields.sigev_notify_thread_id ++#define sigev_notify_function __sev_fields.__sev_thread.sigev_notify_function ++#define sigev_notify_attributes __sev_fields.__sev_thread.sigev_notify_attributes ++ + #define SIGEV_SIGNAL 0 + #define SIGEV_NONE 1 + #define SIGEV_THREAD 2 ++#define SIGEV_THREAD_ID 4 + + int __libc_current_sigrtmin(void); + int __libc_current_sigrtmax(void); +diff --git a/src/time/timer_create.c b/src/time/timer_create.c +index 5ddfda278..4bef23905 100644 +--- a/src/time/timer_create.c ++++ b/src/time/timer_create.c +@@ -71,11 +71,15 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict + switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) { + case SIGEV_NONE: + case SIGEV_SIGNAL: ++ case SIGEV_THREAD_ID: + if (evp) { + ksev.sigev_value = evp->sigev_value; + ksev.sigev_signo = evp->sigev_signo; + ksev.sigev_notify = evp->sigev_notify; +- ksev.sigev_tid = 0; ++ if (evp->sigev_notify == SIGEV_THREAD_ID) ++ ksev.sigev_tid = evp->sigev_notify_thread_id; ++ else ++ ksev.sigev_tid = 0; + ksevp = &ksev; + } + if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0) +@@ -107,7 +111,7 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict + + ksev.sigev_value.sival_ptr = 0; + ksev.sigev_signo = SIGTIMER; +- ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */ ++ ksev.sigev_notify = SIGEV_THREAD_ID; + ksev.sigev_tid = td->tid; + if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0) + timerid = -1; diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 34e6ed4fba6..afb33cd868b 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=11 +revision=12 archs="*-musl" bootstrap=yes build_style=gnu-configure