diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-24 02:50:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-24 02:50:16 +0000 |
| commit | 67b78ef91b1441c7f94fe03e1bad161d5912f5ac (patch) | |
| tree | ae9686b619a6a88901b6ecae921be3a8d1b48e47 /sysdeps/pthread | |
| parent | 7b0a32a30505e02f2b138b1695096b0ddb2ab62d (diff) | |
Update.
* sysdeps/pthread/aio_misc.h: Mark __aio_requests_mutex,
__aio_enqueue_request, __aio_find_req, __aio_find_req_fd,
__aio_free_request, __aio_notify, and __aio_sigqueue as hidden.
* sysdeps/pthread/aio_suspend.c (aio_suspend): Set errno to the result
of pthread_cond_wait if there was an error. Use pthread_cleanup_*
instead of __lbic_cleanup_region_*.
Diffstat (limited to 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/aio_misc.h | 23 | ||||
| -rw-r--r-- | sysdeps/pthread/aio_suspend.c | 8 |
2 files changed, 17 insertions, 14 deletions
diff --git a/sysdeps/pthread/aio_misc.h b/sysdeps/pthread/aio_misc.h index ee0df52970..05e60e7d1e 100644 --- a/sysdeps/pthread/aio_misc.h +++ b/sysdeps/pthread/aio_misc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -90,38 +90,41 @@ struct requestlist /* Lock for global I/O list of requests. */ -extern pthread_mutex_t __aio_requests_mutex; +extern pthread_mutex_t __aio_requests_mutex attribute_hidden; /* Enqueue request. */ extern struct requestlist *__aio_enqueue_request (aiocb_union *aiocbp, int operation) - internal_function; + attribute_hidden internal_function; /* Find request entry for given AIO control block. */ extern struct requestlist *__aio_find_req (aiocb_union *elem) - internal_function; + attribute_hidden internal_function; /* Find request entry for given file descriptor. */ -extern struct requestlist *__aio_find_req_fd (int fildes) internal_function; +extern struct requestlist *__aio_find_req_fd (int fildes) + attribute_hidden internal_function; /* Remove request from the list. */ extern void __aio_remove_request (struct requestlist *last, struct requestlist *req, int all) - internal_function; + attribute_hidden internal_function; /* Release the entry for the request. */ -extern void __aio_free_request (struct requestlist *req) internal_function; +extern void __aio_free_request (struct requestlist *req) + attribute_hidden internal_function; /* Notify initiator of request and tell this everybody listening. */ -extern void __aio_notify (struct requestlist *req) internal_function; +extern void __aio_notify (struct requestlist *req) + attribute_hidden internal_function; /* Notify initiator of request. */ extern int __aio_notify_only (struct sigevent *sigev, pid_t caller_pid) - internal_function; + attribute_hidden internal_function; /* Send the signal. */ extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid) - internal_function; + attribute_hidden internal_function; #endif /* aio_misc.h */ diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c index 92cac81036..8bc8f0e9a1 100644 --- a/sysdeps/pthread/aio_suspend.c +++ b/sysdeps/pthread/aio_suspend.c @@ -141,7 +141,7 @@ aio_suspend (list, nent, timeout) .nent = nent }; - __libc_cleanup_region_start (1, cleanup, &clparam); + pthread_cleanup_push (cleanup, &clparam); if (timeout == NULL) result = pthread_cond_wait (&cond, &__aio_requests_mutex); @@ -165,7 +165,7 @@ aio_suspend (list, nent, timeout) &abstime); } - __libc_cleanup_region_end (0); + pthread_cleanup_pop (0); } /* Now remove the entry in the waiting list for all requests @@ -199,8 +199,8 @@ aio_suspend (list, nent, timeout) form expected from `aio_suspend'. */ if (result == ETIMEDOUT) __set_errno (EAGAIN); - else if (result == EINTR) - __set_errno (EINTR); + else + __set_errno (result); result = -1; } |