projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add bsd fgetln function
[musl]
/
src
/
time
/
timer_create.c
diff --git
a/src/time/timer_create.c
b/src/time/timer_create.c
index
cc10bef
..
813678a
100644
(file)
--- a/
src/time/timer_create.c
+++ b/
src/time/timer_create.c
@@
-40,7
+40,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
+51,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, __SYSCALL_SSLEN
);
}
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,6
+67,9
@@
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);
pthread_barrier_wait(&args->b);
__wait(&self->delete_timer, 0, 0, 1);
__syscall(SYS_timer_delete, self->result);