projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix off-by-one error in checks for implementation-internal signal numbers
[musl]
/
src
/
time
/
timer_create.c
diff --git
a/src/time/timer_create.c
b/src/time/timer_create.c
index
f596b0f
..
f76b9ef
100644
(file)
--- a/
src/time/timer_create.c
+++ b/
src/time/timer_create.c
@@
-1,4
+1,5
@@
#include <time.h>
#include <time.h>
+#include <setjmp.h>
#include "pthread_impl.h"
struct ksigevent {
#include "pthread_impl.h"
struct ksigevent {
@@
-51,13
+52,15
@@
static void install_handler()
.sa_flags = SA_SIGINFO | SA_RESTART
};
__libc_sigaction(SIGTIMER, &sa, 0);
.sa_flags = SA_SIGINFO | SA_RESTART
};
__libc_sigaction(SIGTIMER, &sa, 0);
- __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGTIMER_SET, 0, 8);
+ __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+ SIGTIMER_SET, 0, _NSIG/8);
}
static void *start(void *arg)
{
pthread_t self = __pthread_self();
struct start_args *args = arg;
}
static void *start(void *arg)
{
pthread_t self = __pthread_self();
struct start_args *args = arg;
+ sigset_t set;
/* Reuse no-longer-needed thread structure fields to avoid
* needing the timer address in the signal handler. */
/* Reuse no-longer-needed thread structure fields to avoid
* needing the timer address in the signal handler. */
@@
-65,13
+68,16
@@
static void *start(void *arg)
self->start_arg = args->sev->sigev_value.sival_ptr;
self->result = (void *)-1;
self->start_arg = args->sev->sigev_value.sival_ptr;
self->result = (void *)-1;
+ sigfillset(&set);
+ pthread_sigmask(SIG_BLOCK, &set, 0);
+
pthread_barrier_wait(&args->b);
__wait(&self->delete_timer, 0, 0, 1);
__syscall(SYS_timer_delete, self->result);
return 0;
}
pthread_barrier_wait(&args->b);
__wait(&self->delete_timer, 0, 0, 1);
__syscall(SYS_timer_delete, self->result);
return 0;
}
-int timer_create(clockid_t clk, struct sigevent *
evp, timer_t *
res)
+int timer_create(clockid_t clk, struct sigevent *
restrict evp, timer_t *restrict
res)
{
static pthread_once_t once = PTHREAD_ONCE_INIT;
pthread_t td;
{
static pthread_once_t once = PTHREAD_ONCE_INIT;
pthread_t td;
@@
-80,7
+86,6
@@
int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
struct start_args args;
struct ksigevent ksev, *ksevp=0;
int timerid;
struct start_args args;
struct ksigevent ksev, *ksevp=0;
int timerid;
- sigset_t set;
switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
case SIGEV_NONE:
switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
case SIGEV_NONE:
@@
-94,7
+99,7
@@
int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
}
if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
return -1;
}
if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
return -1;
- *res = (void *)timerid;
+ *res = (void *)
(intptr_t)
timerid;
break;
case SIGEV_THREAD:
pthread_once(&once, install_handler);
break;
case SIGEV_THREAD:
pthread_once(&once, install_handler);
@@
-105,10
+110,7
@@
int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_barrier_init(&args.b, 0, 2);
args.sev = evp;
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_barrier_init(&args.b, 0, 2);
args.sev = evp;
- sigfillset(&set);
- pthread_sigmask(SIG_BLOCK, &set, &set);
r = pthread_create(&td, &attr, start, &args);
r = pthread_create(&td, &attr, start, &args);
- pthread_sigmask(SIG_SETMASK, &set, 0);
if (r) {
errno = r;
return -1;
if (r) {
errno = r;
return -1;
@@
-123,7
+125,7
@@
int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
pthread_cancel(td);
return -1;
}
pthread_cancel(td);
return -1;
}
- td->result = (void *)timerid;
+ td->result = (void *)
(intptr_t)
timerid;
*res = td;
break;
default:
*res = td;
break;
default: