From b9337b6a58501fcbae612a86d4219a8db2c5c1ff Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 11 Apr 1998 09:51:01 +0000 Subject: Update. 1998-04-11 09:33 Ulrich Drepper * Makeconfig (rtobjdir): New variable. (rpath-link): Add rtobjdir and thread directory, if available. * test-skeleton.c: Add support to remove temporary files. Always define test_dir. Improve message about expected signal. * rt/Makefile (tests): Add tst-aio. Add rules for tst-aio to be linked with librt and thread library. * rt/aio_misc.c: Correct fundamental bugs. * rt/aio_suspend.c: Correct bug in test for available request. Initialize conditional variable. * rt/lio_listio.c: Initialize conditional variable. * rt/lio_listio64.c: Likewise. * rt/tst-aio.c: New file. * sysdeps/libm-ieee754/s_signgam.c: Undo last change. * sysdeps/libm-ieee754/w_gamma.c: Likewise. Adopt for ISO C 9x. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. * sysdeps/libm-ieee754/w_lgamma.c: Likewise. * sysdeps/libm-ieee754/w_lgammaf.c: Likewise. * sysdeps/libm-ieee754/w_lgammal.c: Likewise. 1998-04-11 14:49 Mark Kettenis * posix/regex.c [_LIBC] (__re_syntax_options): Initialize to 0. * elf/dl-load.c (open_path): Use correct name for test whether directory in load path exists. * sysdeps/libm-ieee754/s_expm1.c: Remove variable one. * sysdeps/libm-ieee754/e_pow.c: Fix typo. Patches by Tom Rini . * wcsmbs/wcstof_l.c: Declare ____wcstoull_l_internal. * wcsmbs/wcstod_l.c: Likewise. * wcsmbs/wcstold_l.c: Likewise. --- rt/aio_misc.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'rt/aio_misc.c') diff --git a/rt/aio_misc.c b/rt/aio_misc.c index 91c55442b4..030bef9f76 100644 --- a/rt/aio_misc.c +++ b/rt/aio_misc.c @@ -1,5 +1,5 @@ /* Handle general operations. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -27,7 +27,6 @@ #include "aio_misc.h" - /* Pool of request list entries. */ static struct requestlist **pool; @@ -273,7 +272,7 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation) /* The current file descriptor is worked on. It makes no sense to start another thread since this new thread would fight with the running thread for the resources. But we also cannot - say that the thread processing this desriptor shall imeediately + say that the thread processing this desriptor shall immediately after finishing the current job process this request if there are other threads in the running queue which have a higher priority. */ @@ -392,14 +391,18 @@ handle_fildes_io (void *arg) pthread_t self = pthread_self (); struct sched_param param; struct requestlist *runp = (struct requestlist *) arg; - aiocb_union *aiocbp = runp->aiocbp; + aiocb_union *aiocbp; int policy; - int fildes = runp->aiocbp->aiocb.aio_fildes; + int fildes; pthread_getschedparam (self, &policy, ¶m); do { + /* Update our variables. */ + aiocbp = runp->aiocbp; + fildes = aiocbp->aiocb.aio_fildes; + /* Change the priority to the requested value (if necessary). */ if (aiocbp->aiocb.__abs_prio != param.sched_priority || aiocbp->aiocb.__policy != policy) @@ -467,8 +470,8 @@ handle_fildes_io (void *arg) /* Now dequeue the current request. */ if (runp->next_prio == NULL) { - /* No outstanding request for this descriptor. Process the - runlist if necessary. */ + /* No outstanding request for this descriptor. Remove this + descriptor from the list. */ if (runp->next_fd != NULL) runp->next_fd->last_fd = runp->last_fd; if (runp->last_fd != NULL) @@ -488,15 +491,12 @@ handle_fildes_io (void *arg) /* Free the old element. */ __aio_free_request (runp); - runp = freelist; + runp = runlist; if (runp != NULL) { /* We must not run requests which are not marked `running'. */ if (runp->running == yes) - { - freelist = runp->next_run; - runp->running = allocated; - } + runlist = runp->next_run; else { struct requestlist *old; @@ -516,6 +516,8 @@ handle_fildes_io (void *arg) /* If no request to work on we will stop the thread. */ if (runp == NULL) --nthreads; + else + runp->running = allocated; /* Release the mutex. */ pthread_mutex_unlock (&__aio_requests_mutex); -- cgit 1.4.1