#include <time.h>
+#include <setjmp.h>
#include "pthread_impl.h"
struct ksigevent {
if (!setjmp(jb) && si->si_code == SI_TIMER) {
pthread_cleanup_push(cleanup_fromsig, jb);
notify(val);
- pthread_cleanup_pop(0);
+ pthread_cleanup_pop(1);
}
}
.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;
+ sigset_t set;
/* Reuse no-longer-needed thread structure fields to avoid
* needing the timer address in the signal handler. */
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;
}
-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;
}
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);
pthread_cancel(td);
return -1;
}
- td->result = (void *)timerid;
+ td->result = (void *)(intptr_t)timerid;
*res = td;
break;
default: