From a334319f6530564d22e775935d9c91663623a1b4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 22 Dec 2004 20:10:10 +0000 Subject: (CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4. --- sysdeps/pthread/Versions | 5 -- sysdeps/pthread/aio_cancel.c | 4 +- sysdeps/pthread/aio_fsync.c | 4 +- sysdeps/pthread/aio_misc.c | 5 +- sysdeps/pthread/aio_misc.h | 7 +-- sysdeps/pthread/aio_notify.c | 22 +++------ sysdeps/pthread/aio_read.c | 4 +- sysdeps/pthread/aio_read64.c | 4 +- sysdeps/pthread/aio_suspend.c | 41 ++-------------- sysdeps/pthread/aio_write.c | 4 +- sysdeps/pthread/aio_write64.c | 4 +- sysdeps/pthread/configure | 2 +- sysdeps/pthread/lio_listio.c | 107 +++++++++-------------------------------- sysdeps/pthread/lio_listio64.c | 6 +-- 14 files changed, 53 insertions(+), 166 deletions(-) delete mode 100644 sysdeps/pthread/Versions (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/Versions b/sysdeps/pthread/Versions deleted file mode 100644 index a71cffbed4..0000000000 --- a/sysdeps/pthread/Versions +++ /dev/null @@ -1,5 +0,0 @@ -librt { - GLIBC_2.4 { - lio_listio; lio_listio64; - } -} diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c index aa1ee443a5..a37b2c7896 100644 --- a/sysdeps/pthread/aio_cancel.c +++ b/sysdeps/pthread/aio_cancel.c @@ -1,5 +1,5 @@ /* Cancel requests associated with given file descriptor. - Copyright (C) 1997, 1998, 2000, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -34,7 +34,7 @@ #include #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/aio_fsync.c b/sysdeps/pthread/aio_fsync.c index 47cc29991f..4c90d69584 100644 --- a/sysdeps/pthread/aio_fsync.c +++ b/sysdeps/pthread/aio_fsync.c @@ -1,5 +1,5 @@ /* Synchronize I/O in given file descriptor. - Copyright (C) 1997, 1999, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -30,7 +30,7 @@ #undef aio_fsync64 #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c index 3e1dbe9c63..5c9ccb46d0 100644 --- a/sysdeps/pthread/aio_misc.c +++ b/sysdeps/pthread/aio_misc.c @@ -1,5 +1,5 @@ /* Handle general operations. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -46,7 +46,8 @@ __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), void *arg) (void) pthread_attr_destroy (&attr); return ret; -} +} + #endif static void add_request_to_runlist (struct requestlist *newrequest); diff --git a/sysdeps/pthread/aio_misc.h b/sysdeps/pthread/aio_misc.h index 50962c7519..44d53b078f 100644 --- a/sysdeps/pthread/aio_misc.h +++ b/sysdeps/pthread/aio_misc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1999,2000,2001,2003,2006 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 @@ -46,12 +46,7 @@ struct waitlist { struct waitlist *next; - /* The next two fields is used in synchronous `lio_listio' operations. */ -#ifndef DONT_NEED_AIO_MISC_COND pthread_cond_t *cond; -#endif - int *result; - volatile int *counterp; /* The next field is used in asynchronous `lio_listio' operations. */ struct sigevent *sigevp; diff --git a/sysdeps/pthread/aio_notify.c b/sysdeps/pthread/aio_notify.c index 3f7f70ef7c..877e8d9363 100644 --- a/sysdeps/pthread/aio_notify.c +++ b/sysdeps/pthread/aio_notify.c @@ -1,5 +1,6 @@ /* Notify initiator of AIO request. - Copyright (C) 1997-2001, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -143,24 +144,15 @@ __aio_notify (struct requestlist *req) { struct waitlist *next = waitlist->next; - if (waitlist->sigevp == NULL) - { - if (waitlist->result != NULL && aiocbp->__return_value == -1) - *waitlist->result = -1; - -#ifdef DONT_NEED_AIO_MISC_COND - AIO_MISC_NOTIFY (waitlist); -#else - /* Decrement the counter. */ - --*waitlist->counterp; + /* Decrement the counter. This is used in both cases. */ + --*waitlist->counterp; - pthread_cond_signal (waitlist->cond); -#endif - } + if (waitlist->sigevp == NULL) + pthread_cond_signal (waitlist->cond); else /* This is part of a asynchronous `lio_listio' operation. If this request is the last one, send the signal. */ - if (--*waitlist->counterp == 0) + if (*waitlist->counterp == 0) { #ifdef BROKEN_THREAD_SIGNALS __aio_notify_only (waitlist->sigevp, waitlist->caller_pid); diff --git a/sysdeps/pthread/aio_read.c b/sysdeps/pthread/aio_read.c index 973c6cdd48..62646fb12d 100644 --- a/sysdeps/pthread/aio_read.c +++ b/sysdeps/pthread/aio_read.c @@ -1,5 +1,5 @@ /* Asynchronous read. - Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,7 +20,7 @@ #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/aio_read64.c b/sysdeps/pthread/aio_read64.c index a3a427d804..f91b08b6db 100644 --- a/sysdeps/pthread/aio_read64.c +++ b/sysdeps/pthread/aio_read64.c @@ -1,5 +1,5 @@ /* Asynchronous read, 64bit offset version. - Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,7 +20,7 @@ #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c index b85b16d10e..207dad964e 100644 --- a/sysdeps/pthread/aio_suspend.c +++ b/sysdeps/pthread/aio_suspend.c @@ -1,5 +1,5 @@ /* Suspend until termination of a requests. - Copyright (C) 1997-2000,2002,2003,2005,2006 Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -36,7 +36,7 @@ #include #include -#include +#include "aio_misc.h" struct clparam @@ -44,9 +44,7 @@ struct clparam const struct aiocb *const *list; struct waitlist *waitlist; struct requestlist **requestlist; -#ifndef DONT_NEED_AIO_MISC_COND pthread_cond_t *cond; -#endif int nent; }; @@ -54,12 +52,6 @@ struct clparam static void cleanup (void *arg) { -#ifdef DONT_NEED_AIO_MISC_COND - /* Acquire the mutex. If pthread_cond_*wait is used this would - happen implicitly. */ - pthread_mutex_lock (&__aio_requests_mutex); -#endif - const struct clparam *param = (const struct clparam *) arg; /* Now remove the entry in the waiting list for all requests @@ -83,10 +75,8 @@ cleanup (void *arg) *listp = (*listp)->next; } -#ifndef DONT_NEED_AIO_MISC_COND /* Release the conditional variable. */ (void) pthread_cond_destroy (param->cond); -#endif /* Release the mutex. */ pthread_mutex_unlock (&__aio_requests_mutex); @@ -99,21 +89,13 @@ aio_suspend (list, nent, timeout) int nent; const struct timespec *timeout; { - if (__builtin_expect (nent < 0, 0)) - { - __set_errno (EINVAL); - return -1; - } - struct waitlist waitlist[nent]; struct requestlist *requestlist[nent]; -#ifndef DONT_NEED_AIO_MISC_COND pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -#endif int cnt; bool any = false; int result = 0; - int cntr = 1; + int dummy; /* Request the mutex. */ pthread_mutex_lock (&__aio_requests_mutex); @@ -129,12 +111,9 @@ aio_suspend (list, nent, timeout) if (requestlist[cnt] != NULL) { -#ifndef DONT_NEED_AIO_MISC_COND waitlist[cnt].cond = &cond; -#endif - waitlist[cnt].result = NULL; waitlist[cnt].next = requestlist[cnt]->waiting; - waitlist[cnt].counterp = &cntr; + waitlist[cnt].counterp = &dummy; waitlist[cnt].sigevp = NULL; #ifdef BROKEN_THREAD_SIGNALS waitlist[cnt].caller_pid = 0; /* Not needed. */ @@ -160,17 +139,12 @@ aio_suspend (list, nent, timeout) .list = list, .waitlist = waitlist, .requestlist = requestlist, -#ifndef DONT_NEED_AIO_MISC_COND .cond = &cond, -#endif .nent = nent }; pthread_cleanup_push (cleanup, &clparam); -#ifdef DONT_NEED_AIO_MISC_COND - AIO_MISC_WAIT (result, cntr, timeout, 1); -#else if (timeout == NULL) result = pthread_cond_wait (&cond, &__aio_requests_mutex); else @@ -192,7 +166,6 @@ aio_suspend (list, nent, timeout) result = pthread_cond_timedwait (&cond, &__aio_requests_mutex, &abstime); } -#endif pthread_cleanup_pop (0); } @@ -216,23 +189,19 @@ aio_suspend (list, nent, timeout) *listp = (*listp)->next; } -#ifndef DONT_NEED_AIO_MISC_COND /* Release the conditional variable. */ if (__builtin_expect (pthread_cond_destroy (&cond) != 0, 0)) /* This must never happen. */ abort (); -#endif if (result != 0) { -#ifndef DONT_NEED_AIO_MISC_COND - /* An error occurred. Possibly it's ETIMEDOUT. We have to translate + /* An error occurred. Possibly it's EINTR. We have to translate the timeout error report of `pthread_cond_timedwait' to the form expected from `aio_suspend'. */ if (result == ETIMEDOUT) __set_errno (EAGAIN); else -#endif __set_errno (result); result = -1; diff --git a/sysdeps/pthread/aio_write.c b/sysdeps/pthread/aio_write.c index d61c5fbf9d..f5e89e9246 100644 --- a/sysdeps/pthread/aio_write.c +++ b/sysdeps/pthread/aio_write.c @@ -1,5 +1,5 @@ /* Asynchronous write. - Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,7 +20,7 @@ #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/aio_write64.c b/sysdeps/pthread/aio_write64.c index 4e23a3af95..b9c84b760b 100644 --- a/sysdeps/pthread/aio_write64.c +++ b/sysdeps/pthread/aio_write64.c @@ -1,5 +1,5 @@ /* Asynchronous write, 64bit offset version. - Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,7 +20,7 @@ #include -#include +#include "aio_misc.h" int diff --git a/sysdeps/pthread/configure b/sysdeps/pthread/configure index e39d31138d..229414dd74 100644 --- a/sysdeps/pthread/configure +++ b/sysdeps/pthread/configure @@ -1,3 +1,3 @@ -# Local configure fragment for sysdeps/pthread. +# Local configure fragment for sysdeps/unix/sysv/linux. DEFINES="$DEFINES -D_LIBC_REENTRANT" diff --git a/sysdeps/pthread/lio_listio.c b/sysdeps/pthread/lio_listio.c index c652404ae2..5b98837b0d 100644 --- a/sysdeps/pthread/lio_listio.c +++ b/sysdeps/pthread/lio_listio.c @@ -1,6 +1,5 @@ /* Enqueue and list of read or write requests. - Copyright (C) 1997,1998,1999,2000,2001,2003,2005,2006 - Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -26,14 +25,11 @@ #include #include -#include +#include "aio_misc.h" #define LIO_OPCODE_BASE 0 #endif -#include - - /* We need this special structure to handle asynchronous I/O. */ struct async_waitlist { @@ -43,22 +39,12 @@ struct async_waitlist }; -/* The code in glibc 2.1 to glibc 2.4 issued only one event when all - requests submitted with lio_listio finished. The existing practice - is to issue events for the individual requests as well. This is - what the new code does. */ -#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_4) -# define LIO_MODE(mode) ((mode) & 127) -# define NO_INDIVIDUAL_EVENT_P(mode) ((mode) & 128) -#else -# define LIO_MODE(mode) mode -# define NO_INDIVIDUAL_EVENT_P(mode) 0 -#endif - - -static int -lio_listio_internal (int mode, struct aiocb *const list[], int nent, - struct sigevent *sig) +int +lio_listio (mode, list, nent, sig) + int mode; + struct aiocb *const list[]; + int nent; + struct sigevent *sig; { struct sigevent defsigev; struct requestlist *requests[nent]; @@ -66,6 +52,13 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, volatile int total = 0; int result = 0; + /* Check arguments. */ + if (mode != LIO_WAIT && mode != LIO_NOWAIT) + { + __set_errno (EINVAL); + return -1; + } + if (sig == NULL) { defsigev.sigev_notify = SIGEV_NONE; @@ -80,9 +73,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, for (cnt = 0; cnt < nent; ++cnt) if (list[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP) { - if (NO_INDIVIDUAL_EVENT_P (mode)) - list[cnt]->aio_sigevent.sigev_notify = SIGEV_NONE; - + list[cnt]->aio_sigevent.sigev_notify = SIGEV_NONE; requests[cnt] = __aio_enqueue_request ((aiocb_union *) list[cnt], (list[cnt]->aio_lio_opcode | LIO_OPCODE_BASE)); @@ -108,7 +99,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, locked forever. */ pthread_mutex_unlock (&__aio_requests_mutex); - if (LIO_MODE (mode) == LIO_NOWAIT) + if (mode == LIO_NOWAIT) { #ifdef BROKEN_THREAD_SIGNALS __aio_notify_only (sig, @@ -120,13 +111,11 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, return result; } - else if (LIO_MODE (mode) == LIO_WAIT) + else if (mode == LIO_WAIT) { -#ifndef DONT_NEED_AIO_MISC_COND pthread_cond_t cond = PTHREAD_COND_INITIALIZER; - int oldstate; -#endif struct waitlist waitlist[nent]; + int oldstate; total = 0; for (cnt = 0; cnt < nent; ++cnt) @@ -135,10 +124,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, if (requests[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP) { -#ifndef DONT_NEED_AIO_MISC_COND waitlist[cnt].cond = &cond; -#endif - waitlist[cnt].result = &result; waitlist[cnt].next = requests[cnt]->waiting; waitlist[cnt].counterp = &total; waitlist[cnt].sigevp = NULL; @@ -150,32 +136,21 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, } } -#ifdef DONT_NEED_AIO_MISC_COND - AIO_MISC_WAIT (result, total, NULL, 0); -#else - /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancellation + /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancelation points we must be careful. We added entries to the waiting lists - which we must remove. So defer cancellation for now. */ + which we must remove. So defer cancelation 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 cancellation state. */ + /* Now it's time to restore the cancelation state. */ pthread_setcancelstate (oldstate, NULL); /* Release the conditional variable. */ if (pthread_cond_destroy (&cond) != 0) /* This must never happen. */ abort (); -#endif - - /* If any of the I/O requests failed, return -1 and set errno. */ - if (result != 0) - { - __set_errno (result == EINTR ? EINTR : EIO); - result = -1; - } } else { @@ -204,10 +179,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, if (requests[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP) { -#ifndef DONT_NEED_AIO_MISC_COND waitlist->list[cnt].cond = NULL; -#endif - waitlist->list[cnt].result = NULL; waitlist->list[cnt].next = requests[cnt]->waiting; waitlist->list[cnt].counterp = &waitlist->counter; waitlist->list[cnt].sigevp = &waitlist->sigev; @@ -229,38 +201,3 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent, return result; } - - -#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_4) -int -attribute_compat_text_section -__lio_listio_21 (int mode, struct aiocb *const list[], int nent, - struct sigevent *sig) -{ - /* Check arguments. */ - if (mode != LIO_WAIT && mode != LIO_NOWAIT) - { - __set_errno (EINVAL); - return -1; - } - - return lio_listio_internal (mode | LIO_NO_INDIVIDUAL_EVENT, list, nent, sig); -} -compat_symbol (librt, __lio_listio_21, lio_listio, GLIBC_2_1); -#endif - - -int -__lio_listio_item_notify (int mode, struct aiocb *const list[], int nent, - struct sigevent *sig) -{ - /* Check arguments. */ - if (mode != LIO_WAIT && mode != LIO_NOWAIT) - { - __set_errno (EINVAL); - return -1; - } - - return lio_listio_internal (mode, list, nent, sig); -} -versioned_symbol (librt, __lio_listio_item_notify, lio_listio, GLIBC_2_4); diff --git a/sysdeps/pthread/lio_listio64.c b/sysdeps/pthread/lio_listio64.c index c6b7cf7bd2..fee1e591ef 100644 --- a/sysdeps/pthread/lio_listio64.c +++ b/sysdeps/pthread/lio_listio64.c @@ -1,5 +1,5 @@ /* Enqueue and list of read or write requests, 64bit offset version. - Copyright (C) 1997,1998,1999,2003,2005,2006 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -24,11 +24,9 @@ #include #include -#include +#include "aio_misc.h" #define lio_listio lio_listio64 -#define __lio_listio_21 __lio_listio64_21 -#define __lio_listio_item_notify __lio_listio64_item_notify #define aiocb aiocb64 #define LIO_OPCODE_BASE 128 #include -- cgit v1.2.3