projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work around wrong kernel type for sem_nsems member of struct semid_ds
[musl]
/
src
/
time
/
timer_create.c
diff --git
a/src/time/timer_create.c
b/src/time/timer_create.c
index
cc10bef
..
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 {
@@
-40,7
+41,7
@@
static void timer_handler(int sig, siginfo_t *si, void *ctx)
if (!setjmp(jb) && si->si_code == SI_TIMER) {
pthread_cleanup_push(cleanup_fromsig, jb);
notify(val);
if (!setjmp(jb) && si->si_code == SI_TIMER) {
pthread_cleanup_push(cleanup_fromsig, jb);
notify(val);
- pthread_cleanup_pop(
0
);
+ pthread_cleanup_pop(
1
);
}
}
}
}
@@
-51,14
+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);
- sigaddset(&sa.sa_mask, SIGTIMER);
-
__libc_sigprocmask(SIG_UNBLOCK, &sa.sa_mask, 0
);
+ __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. */
@@
-66,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;
@@
-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);
@@
-120,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: