aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/pthread/lio_listio.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-04 20:05:05 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-04 20:05:05 +0000
commit9759bbf188a13130bf8384694d24ac5493830d13 (patch)
tree42ae80ed8a327a40e7316d2f7b8efa574a18a48f /sysdeps/pthread/lio_listio.c
parent4da28a490bc322423d9b26de8abe377965666ef9 (diff)
downloadglibc-9759bbf188a13130bf8384694d24ac5493830d13.tar
glibc-9759bbf188a13130bf8384694d24ac5493830d13.tar.gz
glibc-9759bbf188a13130bf8384694d24ac5493830d13.tar.bz2
glibc-9759bbf188a13130bf8384694d24ac5493830d13.zip
* sysdeps/powerpc/powerpc32/sysdep.h (ENTRY, EALIGN): Add cfi_startproc
directive to ENTRY macros. (END): Add cfi_endproc directive to END macro. * sysdeps/powerpc/powerpc64/sysdep.h (ENTRY, EALIGN): Add cfi_startproc directive to ENTRY macros. (END, END_GEN_TB): Add cfi_endproc directive to END macros. * sysdeps/powerpc/powerpc32/dl-start.S: Remove ENTRY()s for _dl_start_user and _dl_main_dispatch. * sysdeps/powerpc/powerpc32/fpu/fprrest.S: Use END macro. * sysdeps/powerpc/powerpc32/fpu/fprsave.S: Use Likewise. * sysdeps/powerpc/powerpc32/gprrest0.S: Likewise. * sysdeps/powerpc/powerpc32/gprrest1.S: Likewise. * sysdeps/powerpc/powerpc32/gprsave0.S: Likewise. * sysdeps/powerpc/powerpc32/gprsave1.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S: Remove redundant cfi_startproc and cfi_endproc. * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Likewise. 2006-01-04 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/aio_misc.h (struct waitlist): Add result member. * sysdeps/pthread/aio_notify.c (__aio_notify): For synchronous waiters, failed I/O, and a result pointer, set value to -1. * sysdeps/pthread/aio_suspend.c: Initialize result pointer to NULL. * sysdeps/pthread/lio_listio.c: For LIO_WAIT, point result pointer in wait list to local variable result. If nonzero afterwards, set errno to EIO. For LIO_NOWAIT set result to NULL. * rt/Makefile (tests): Add tst-aio8. * rt/tst-aio8.c: New file.
Diffstat (limited to 'sysdeps/pthread/lio_listio.c')
-rw-r--r--sysdeps/pthread/lio_listio.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sysdeps/pthread/lio_listio.c b/sysdeps/pthread/lio_listio.c
index 815840397e..d6ad5a2b48 100644
--- a/sysdeps/pthread/lio_listio.c
+++ b/sysdeps/pthread/lio_listio.c
@@ -134,6 +134,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent,
if (requests[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP)
{
waitlist[cnt].cond = &cond;
+ waitlist[cnt].result = &result;
waitlist[cnt].next = requests[cnt]->waiting;
waitlist[cnt].counterp = &total;
waitlist[cnt].sigevp = NULL;
@@ -145,21 +146,25 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent,
}
}
- /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancelation
+ /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancellation
points we must be careful. We added entries to the waiting lists
- which we must remove. So defer cancelation for now. */
+ which we must remove. So defer cancellation for now. */
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
while (total > 0)
pthread_cond_wait (&cond, &__aio_requests_mutex);
- /* Now it's time to restore the cancelation state. */
+ /* Now it's time to restore the cancellation state. */
pthread_setcancelstate (oldstate, NULL);
/* Release the conditional variable. */
if (pthread_cond_destroy (&cond) != 0)
/* This must never happen. */
abort ();
+
+ /* If any of the I/O requests failed, return -1 and set errno. */
+ if (result != 0)
+ __set_errno (EIO);
}
else
{
@@ -189,6 +194,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent,
&& list[cnt]->aio_lio_opcode != LIO_NOP)
{
waitlist->list[cnt].cond = NULL;
+ waitlist->list[cnt].result = NULL;
waitlist->list[cnt].next = requests[cnt]->waiting;
waitlist->list[cnt].counterp = &waitlist->counter;
waitlist->list[cnt].sigevp = &waitlist->sigev;