diff options
| author | Daniel Eischen <deischen@FreeBSD.org> | 2005-08-03 00:48:13 +0000 |
|---|---|---|
| committer | Daniel Eischen <deischen@FreeBSD.org> | 2005-08-03 00:48:13 +0000 |
| commit | 7f2461f3156342398622a9976fa88cdfad37508b (patch) | |
| tree | bb9ddf960cfe87cc7f9926130c2ab43844163cd4 /lib | |
| parent | 358371dcec9cb952067261683e0bfc6d4b9c15bb (diff) | |
| download | src-7f2461f3156342398622a9976fa88cdfad37508b.tar.gz src-7f2461f3156342398622a9976fa88cdfad37508b.zip | |
Add a cancellation point for usleep().
Notes
Notes:
svn path=/head/; revision=148660
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libkse/thread/thr_sleep.c | 17 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_sleep.c | 17 |
2 files changed, 32 insertions, 2 deletions
diff --git a/lib/libkse/thread/thr_sleep.c b/lib/libkse/thread/thr_sleep.c index 7547e60674a1..682c76403213 100644 --- a/lib/libkse/thread/thr_sleep.c +++ b/lib/libkse/thread/thr_sleep.c @@ -33,9 +33,11 @@ #include <pthread.h> #include "thr_private.h" -extern unsigned int __sleep(unsigned int); +extern unsigned int __sleep(unsigned int); +extern int __usleep(useconds_t); __weak_reference(_sleep, sleep); +__weak_reference(_usleep, usleep); unsigned int _sleep(unsigned int seconds) @@ -49,3 +51,16 @@ _sleep(unsigned int seconds) return (ret); } + +int +_usleep(useconds_t useconds) +{ + struct pthread *curthread = _get_curthread(); + unsigned int ret; + + _thr_cancel_enter(curthread); + ret = __usleep(useconds); + _thr_cancel_leave(curthread, 1); + + return (ret); +} diff --git a/lib/libpthread/thread/thr_sleep.c b/lib/libpthread/thread/thr_sleep.c index 7547e60674a1..682c76403213 100644 --- a/lib/libpthread/thread/thr_sleep.c +++ b/lib/libpthread/thread/thr_sleep.c @@ -33,9 +33,11 @@ #include <pthread.h> #include "thr_private.h" -extern unsigned int __sleep(unsigned int); +extern unsigned int __sleep(unsigned int); +extern int __usleep(useconds_t); __weak_reference(_sleep, sleep); +__weak_reference(_usleep, usleep); unsigned int _sleep(unsigned int seconds) @@ -49,3 +51,16 @@ _sleep(unsigned int seconds) return (ret); } + +int +_usleep(useconds_t useconds) +{ + struct pthread *curthread = _get_curthread(); + unsigned int ret; + + _thr_cancel_enter(curthread); + ret = __usleep(useconds); + _thr_cancel_leave(curthread, 1); + + return (ret); +} |