diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-11-27 19:43:56 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-11-27 19:43:56 +0000 |
| commit | e3f7d63389bbfad1413bfd08d7127f0af07be069 (patch) | |
| tree | 19644065275d0fa2476b93675b67395ee08e92b7 /lib/librthread | |
| parent | c84c43b4dd4a0b4fd392f5b5171ce683234649e4 (diff) | |
Convert thrsigdivert to (almost) be sigtimedwait by adding siginfo_t
and struct timespec * argument. sigtimedwait is just a one line
wrapper after this.
"get it in" deraadt@, tedu@, cheers by others
Diffstat (limited to 'lib/librthread')
| -rw-r--r-- | lib/librthread/rthread.h | 4 | ||||
| -rw-r--r-- | lib/librthread/rthread_sig.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/librthread/rthread.h b/lib/librthread/rthread.h index 29102eb6ce7..21a8c165365 100644 --- a/lib/librthread/rthread.h +++ b/lib/librthread/rthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.h,v 1.23 2009/11/27 19:42:24 guenther Exp $ */ +/* $OpenBSD: rthread.h,v 1.24 2009/11/27 19:43:55 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -169,4 +169,4 @@ void threxit(pid_t *); int thrsleep(void *, int, void *); int thrwakeup(void *, int n); int sched_yield(void); -int thrsigdivert(sigset_t); +int thrsigdivert(sigset_t, siginfo_t *, const struct timespec *); diff --git a/lib/librthread/rthread_sig.c b/lib/librthread/rthread_sig.c index 1437e2a0c97..392e20c43e9 100644 --- a/lib/librthread/rthread_sig.c +++ b/lib/librthread/rthread_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sig.c,v 1.7 2009/02/20 02:38:57 guenther Exp $ */ +/* $OpenBSD: rthread_sig.c,v 1.8 2009/11/27 19:43:55 guenther Exp $ */ /* * Copyright (c) 2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -47,9 +47,10 @@ sigwait(const sigset_t *set, int *sig) { int ret; - ret = thrsigdivert(*set); + ret = thrsigdivert(*set, NULL, NULL); if (ret == -1) return errno; *sig = ret; return 0; } + |