Add a cancellation point for usleep().

While here, fix sleep() so that it is also a cancellation point (a
missing weak reference prevented that).
This commit is contained in:
deischen 2005-08-03 00:47:31 +00:00
parent b6d33128d9
commit 6f4c090af6

View File

@ -97,6 +97,7 @@ extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds,
extern unsigned int __sleep(unsigned int);
extern int __system(const char *);
extern int __tcdrain(int);
extern int __usleep(useconds_t);
extern pid_t __wait(int *);
extern pid_t __sys_wait4(pid_t, int *, int, struct rusage *);
extern pid_t __waitpid(pid_t, int *, int);
@ -473,6 +474,8 @@ __sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t,
return (ret);
}
__weak_reference(_sleep, sleep);
unsigned int
_sleep(unsigned int seconds)
{
@ -519,6 +522,22 @@ _tcdrain(int fd)
return (ret);
}
__weak_reference(_usleep, usleep);
int
_usleep(useconds_t useconds)
{
struct pthread *curthread = _get_curthread();
int oldcancel;
int ret;
oldcancel = _thr_cancel_enter(curthread);
ret = __usleep(useconds);
_thr_cancel_leave(curthread, oldcancel);
return (ret);
}
__weak_reference(_vfork, vfork);
int