struct start_args {
pthread_barrier_t b;
struct sigevent *sev;
- timer_t t;
};
-static void sighandler(int sig, siginfo_t *si, void *ctx)
+void __sigtimer_handler(pthread_t self)
{
int st;
- pthread_t self = __pthread_self();
void (*notify)(union sigval) = (void (*)(union sigval))self->start;
union sigval val = { .sival_ptr = self->start_arg };
pthread_setcancelstate(st, 0);
}
-static void killtimer(void *arg)
+static void cleanup(void *p)
{
- timer_t t = arg;
- if (t->timerid >= 0) __syscall(SYS_timer_delete, t->timerid);
+ pthread_t self = p;
+ __syscall(SYS_timer_delete, self->result);
}
static void *start(void *arg)
{
pthread_t self = __pthread_self();
struct start_args *args = arg;
- struct __timer t = { .timerid = -1 };
/* Reuse no-longer-needed thread structure fields to avoid
* needing the timer address in the signal handler. */
self->start = (void *(*)(void *))args->sev->sigev_notify_function;
self->start_arg = args->sev->sigev_value.sival_ptr;
- args->t = &t;
+ self->result = (void *)-1;
- pthread_cleanup_push(killtimer, &t);
+ pthread_cleanup_push(cleanup, self);
pthread_barrier_wait(&args->b);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
/* Loop on async-signal-safe cancellation point */
- for (;;) sleep(1);
- pthread_cleanup_pop(1);
+ for (;;) sleep(1000000000);
+ pthread_cleanup_pop(0);
return 0;
}
int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
{
- struct sigevent sev = {
- .sigev_notify = SIGEV_SIGNAL,
- .sigev_signo = SIGALRM
- };
pthread_t td;
pthread_attr_t attr;
int r;
struct start_args args;
- timer_t t;
- struct ksigevent ksev;
+ struct ksigevent ksev, *ksevp=0;
int timerid;
- if (evp) sev = *evp;
-
- switch (sev.sigev_notify) {
+ switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
case SIGEV_NONE:
case SIGEV_SIGNAL:
- ksev.sigev_value = evp ? sev.sigev_value
- : (union sigval){.sival_ptr=t};
- ksev.sigev_signo = sev.sigev_signo;
- ksev.sigev_notify = sev.sigev_notify;
- ksev.sigev_tid = 0;
- if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
- return -1;
- if (!(t = calloc(1, sizeof *t))) {
- syscall(SYS_timer_delete, timerid);
- return -1;
+ if (evp) {
+ ksev.sigev_value = evp->sigev_value;
+ ksev.sigev_signo = evp->sigev_signo;
+ ksev.sigev_notify = evp->sigev_notify;
+ ksev.sigev_tid = 0;
+ ksevp = &ksev;
}
- t->timerid = timerid;
+ if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
+ return -1;
+ *res = (void *)timerid;
break;
case SIGEV_THREAD:
- if (!libc.sigtimer) libc.sigtimer = sighandler;
- if (sev.sigev_notify_attributes)
- attr = *sev.sigev_notify_attributes;
+ if (evp->sigev_notify_attributes)
+ attr = *evp->sigev_notify_attributes;
else
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_barrier_init(&args.b, 0, 2);
- args.sev = &sev;
+ args.sev = evp;
r = pthread_create(&td, &attr, start, &args);
if (r) {
errno = r;
ksev.sigev_tid = td->tid;
r = syscall(SYS_timer_create, clk, &ksev, &timerid);
pthread_barrier_wait(&args.b);
- t = args.t;
if (r < 0) {
pthread_cancel(td);
return -1;
}
- t->timerid = timerid;
- t->thread = td;
+ td->result = (void *)timerid;
+ *res = td;
break;
default:
errno = EINVAL;
return -1;
}
- *res = t;
return 0;
}