mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
Update.
2003-01-02 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/aio_suspend.c (aio_suspend): Simplify by removing 'any' variable.
This commit is contained in:
parent
bf293afeca
commit
8ee8768079
@ -1,3 +1,8 @@
|
||||
2003-01-02 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/pthread/aio_suspend.c (aio_suspend): Simplify by
|
||||
removing 'any' variable.
|
||||
|
||||
2003-01-02 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/arm/sigaction.c (__sigaction,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Suspend until termination of a requests.
|
||||
Copyright (C) 1997, 1998, 1999, 2000, 2002 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 <drepper@cygnus.com>, 1997.
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
@ -50,7 +49,6 @@ aio_suspend (list, nent, timeout)
|
||||
int cnt;
|
||||
int result = 0;
|
||||
int dummy;
|
||||
bool any = false;
|
||||
|
||||
/* Request the mutex. */
|
||||
pthread_mutex_lock (&__aio_requests_mutex);
|
||||
@ -72,7 +70,6 @@ aio_suspend (list, nent, timeout)
|
||||
waitlist[cnt].sigevp = NULL;
|
||||
waitlist[cnt].caller_pid = 0; /* Not needed. */
|
||||
requestlist[cnt]->waiting = &waitlist[cnt];
|
||||
any = true;
|
||||
}
|
||||
else
|
||||
/* We will never suspend. */
|
||||
@ -83,9 +80,9 @@ aio_suspend (list, nent, timeout)
|
||||
break;
|
||||
}
|
||||
|
||||
/* If there is no finished request wait for it. In any case we have
|
||||
to dequeue the requests if we enqueued them. */
|
||||
if (any)
|
||||
|
||||
/* Only if none of the entries is NULL or finished to be wait. */
|
||||
if (cnt == nent)
|
||||
{
|
||||
int oldstate;
|
||||
|
||||
@ -94,9 +91,6 @@ aio_suspend (list, nent, timeout)
|
||||
which we must remove. So defer cancelation for now. */
|
||||
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
|
||||
|
||||
/* Only if none of the entries is NULL or finished to be wait. */
|
||||
if (cnt == nent)
|
||||
{
|
||||
if (timeout == NULL)
|
||||
result = pthread_cond_wait (&cond, &__aio_requests_mutex);
|
||||
else
|
||||
@ -118,6 +112,9 @@ aio_suspend (list, nent, timeout)
|
||||
result = pthread_cond_timedwait (&cond, &__aio_requests_mutex,
|
||||
&abstime);
|
||||
}
|
||||
|
||||
/* Now it's time to restore the cancellation state. */
|
||||
pthread_setcancelstate (oldstate, NULL);
|
||||
}
|
||||
|
||||
/* Now remove the entry in the waiting list for all requests
|
||||
@ -129,9 +126,8 @@ aio_suspend (list, nent, timeout)
|
||||
|
||||
assert (requestlist[cnt] != NULL);
|
||||
|
||||
/* There is the chance that we cannot find our entry anymore.
|
||||
This could happen if the request terminated and restarted
|
||||
again. */
|
||||
/* There is the chance that we cannot find our entry anymore. This
|
||||
could happen if the request terminated and restarted again. */
|
||||
listp = &requestlist[cnt]->waiting;
|
||||
while (*listp != NULL && *listp != &waitlist[cnt])
|
||||
listp = &(*listp)->next;
|
||||
@ -140,9 +136,6 @@ aio_suspend (list, nent, timeout)
|
||||
*listp = (*listp)->next;
|
||||
}
|
||||
|
||||
/* Now it's time to restore the cancelation state. */
|
||||
pthread_setcancelstate (oldstate, NULL);
|
||||
|
||||
/* Release the conditional variable. */
|
||||
if (__builtin_expect (pthread_cond_destroy (&cond) != 0, 0))
|
||||
/* This must never happen. */
|
||||
@ -158,7 +151,6 @@ aio_suspend (list, nent, timeout)
|
||||
|
||||
result = -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Release the mutex. */
|
||||
pthread_mutex_unlock (&__aio_requests_mutex);
|
||||
|
Loading…
Reference in New Issue
Block a user