glibc/rt/aio_misc.c
Ulrich Drepper 740152054e Update.
1998-01-22 00:55  Ulrich Drepper  <drepper@happy.cygnus.com>

	* libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo,
	__pread64, __pwrite64, and __getpid.

	* libc/rt/aio_misc.c: Use pread and pwrite instead of __ protected
	versions.

1998-01-06  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define the
	cancelable socket functions as __libc_xxx with __xxx as weak
	alias.
	* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.

	* sysdeps/unix/sysv/linux/m68k/socket.S: Allow __socket to be
	redefined.
	* sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
	* sysdeps/unix/sysv/linux/arm/socket.S: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Likewise.

	* sysdeps/unix/sysv/linux/accept.S: Make __libc_xxx the main name
	and __xxx a weak alias.
	* sysdeps/unix/sysv/linux/connect.S: Likewise.
	* sysdeps/unix/sysv/linux/recv.S: Likewise.
	* sysdeps/unix/sysv/linux/recvfrom.S: Likewise.
	* sysdeps/unix/sysv/linux/recvmsg.S: Likewise.
	* sysdeps/unix/sysv/linux/send.S: Likewise.
	* sysdeps/unix/sysv/linux/sendmsg.S: Likewise.
	* sysdeps/unix/sysv/linux/sendto.S: Likewise.

1998-01-21  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* locale/langinfo.h: Add defines.

	* dirent/dirent.h: Add defines for DT_*, check also for
	_DIRENT_HAVE_D_TYPE.
	Suggested by Roland McGrath.

1998-01-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/netinet/ip_fw.h:
	Update from Linux 2.1.73+79.

	* README.template: Update information about possible
	configurations.

	* manual/mbyte.texi (Wide String Conversion): Fix declaration of
	wcstombs. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>.
	[PR libc/417].

	* manual/time.texi (Priority): Correct description of
	PRIO_MAX. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>.
	[PR libc/416].

11998-01-21 21:34  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/alpha/fpu/bits/mathdef.h: Add definition of FP_ILOGB0 and
	FP_ILOGNAN.   Patch by a sun <asun@zoology.washington.edu>.

1998-01-21 17:53  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/_strerror.c: Handle BUFLEN == 0.  Reported by
	Andreas Jaeger.

1998-01-20 18:13  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-collate.c: Little optimizations.

	* stdio-common/xbug.c: Unset LD_LIBRRARY_PATH variable.

	* string/Makefile (tests): Add tst-inlcall.
	* string/tst-inlcall.c: New file.

	* string/strsignal.c: Add support for real-time signals.

	* sysdeps/generic/_strerror.c: Fix Handling of unknown error in
	presense of small buffer.

	* sysdeps/i386/bits/string.h: Define _HAVE_STRING_ARCH_* macros.

	* sysdeps/i386/i486/bits/string.h: Correct strrchr implementation
	for i686.

	* sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to
	_NSIG + 1.
	
1998-01-02 15:10  Matthias Urlichs   <urlichs@noris.de>

	* Rules: Add explicit rule for dummy.o; at least one library needs
	  it and it isn't autogenerated by the default rules.
	
1997-12-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* math/libm-test.c: Tweak epsilons.

1997-12-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* math/test-fenv.c (feenv_nomask_test): Avoid dumping core in the
	child.
	(feenv_mask_test): Likewise.

1998-01-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makeconfig: Don't export CPPFLAGS.

1998-01-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sunrpc/rpc_main.c (parseargs): Use perror to print error
	message.

1998-01-15  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
	* nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include
	terminating null in key size.

1998-01-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* nss/nss_files/files-service.c: Fix allocation size to include
	length of PROTO.

	* nss/nss_db/db-XXX.c (lookup): Always set errno and h_errno if
	applicable.  Fix return value and error checking.
	(CONCAT(_nss_db_get,ENTNAME_r)): Loop around to skip over
	unparsable lines.
	(DB_LOOKUP): Allocate space for terminating null byte.

	* nss/db-Makefile ($(VAR_DB)/passwd.db): Don't handle duplicate
	uids specially.

	* db2/makedb.c (process_input): Continue processing if a duplicate
	key is encountered.

1998-01-19 15:20  Ulrich Drepper  <drepper@cygnus.com>

	* time/tzfile.h: Updated from tzcode1998b.
	* time/zdump.c: Likewise.
	* time/zic.c: Likewise.
	* time/africa: Update from tzdata1998b.
	* time/antarctica: Likewise.
	* time/asia: Likewise.
	* time/australasia: Likewise.
	* time/etcetera: Likewise.
	* time/europe: Likewise.
	* time/leapseconds: Likewise.
	* time/northamerica: Likewise.
	* time/southamerica: Likewise.
	
1998-01-12  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nss/nss_files/files-alias.c (get_next_alias): Do mail alias
	lookups ignoring case.
	* nss/nss_files/files-network.c: Do network lookups ignoring
	case.
	* nss/nss_files/files-hosts.c: Do hostname lookups ignoring
	case.
	* nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): New macro for
	case insensitive comparing.
	Patches by Cristian Gafton <gafton@redhat.com>.

1998-01-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/net/if.h: Add IFF_*defines.  Suggested
	by Roland McGrath. [PR libc/395]

1998-01-08  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

 	* manual/arith.texi (Parsing of Integers): Correct description of
 	strtoul. Pointed out by Scott Snyder <snyder@fnald0.fnal.gov>.
 	[PR libc/396]

1997-12-30 14:14  Matthias Urlichs  <urlichs@noris.de>

        * misc/lsearch.c (lsearch): Return a pointer to the new element
        if one was "allocated".

1997-12-26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

        * string/strsignal.c: NSIG is not a valid index into
        _sys_siglist.  Don't zap the last character of the "Unknown
        signal" message.

1998-01-19 15:08  Ulrich Drepper  <drepper@cygnus.com>
	
	* locale/programs/charmap.c (parse_charmap): Correct parsing of
	ellipsis expressions.

	* locale/programs/charset.c (insert_char): Correctly insert value
	of eliipsis expression.
1998-01-21 17:04:36 +00:00

547 lines
14 KiB
C

/* Handle general operations.
Copyright (C) 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <aio.h>
#include <errno.h>
#include <pthread.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include "aio_misc.h"
/* Pool of request list entries. */
static struct requestlist **pool;
/* Number of total and allocated pool entries. */
static size_t pool_tab_size;
static size_t pool_size;
/* We implement a two dimensional array but allocate each row separately.
The macro below determines how many entries should be used per row.
It should better be a power of two. */
#define ENTRIES_PER_ROW 16
/* The row table is incremented in units of this. */
#define ROW_STEP 8
/* List of available entries. */
static struct requestlist *freelist;
/* List of request waiting to be processed. */
static struct requestlist *runlist;
/* Structure list of all currently processed requests. */
static struct requestlist *requests;
/* Number of threads currently running. */
static int nthreads;
/* These are the values used to optimize the use of AIO. The user can
overwrite them by using the `aio_init' function. */
static struct aioinit optim =
{
20, /* int aio_threads; Maximal number of threads. */
256, /* int aio_num; Number of expected simultanious requests. */
0,
0,
0,
0,
{ 0, }
};
/* Since the list is global we need a mutex protecting it. */
pthread_mutex_t __aio_requests_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
/* Functions to handle request list pool. */
static struct requestlist *
get_elem (void)
{
struct requestlist *result;
if (freelist == NULL)
{
struct requestlist *new_row;
size_t new_size;
/* Compute new size. */
new_size = pool_size ? pool_size + ENTRIES_PER_ROW : optim.aio_num;
if ((new_size / ENTRIES_PER_ROW) >= pool_tab_size)
{
size_t new_tab_size = new_size / ENTRIES_PER_ROW;
struct requestlist **new_tab;
new_tab = (struct requestlist **)
realloc (pool, (new_tab_size * sizeof (struct requestlist *)));
if (new_tab == NULL)
return NULL;
pool_tab_size = new_tab_size;
pool = new_tab;
}
if (pool_size == 0)
{
size_t cnt;
new_row = (struct requestlist *)
calloc (new_size, sizeof (struct requestlist));
if (new_row == NULL)
return NULL;
for (cnt = 0; cnt < new_size / ENTRIES_PER_ROW; ++cnt)
pool[cnt] = &new_row[cnt * ENTRIES_PER_ROW];
}
else
{
/* Allocat one new row. */
new_row = (struct requestlist *)
calloc (ENTRIES_PER_ROW, sizeof (struct requestlist));
if (new_row == NULL)
return NULL;
pool[new_size / ENTRIES_PER_ROW] = new_row;
}
/* Put all the new entries in the freelist. */
do
{
new_row->next_prio = freelist;
freelist = new_row++;
}
while (++pool_size < new_size);
}
result = freelist;
freelist = freelist->next_prio;
return result;
}
void
__aio_free_request (struct requestlist *elem)
{
elem->running = no;
elem->next_prio = freelist;
freelist = elem;
}
struct requestlist *
__aio_find_req (aiocb_union *elem)
{
struct requestlist *runp = requests;
int fildes = elem->aiocb.aio_fildes;
while (runp != NULL && runp->aiocbp->aiocb.aio_fildes < fildes)
runp = runp->next_fd;
if (runp != NULL)
if (runp->aiocbp->aiocb.aio_fildes != fildes)
runp = NULL;
else
while (runp != NULL && runp->aiocbp != elem)
runp = runp->next_prio;
return runp;
}
struct requestlist *
__aio_find_req_fd (int fildes)
{
struct requestlist *runp = requests;
while (runp != NULL && runp->aiocbp->aiocb.aio_fildes < fildes)
runp = runp->next_fd;
return (runp != NULL && runp->aiocbp->aiocb.aio_fildes == fildes
? runp : NULL);
}
/* The thread handler. */
static void *handle_fildes_io (void *arg);
/* User optimization. */
void
__aio_init (const struct aioinit *init)
{
/* Get the mutex. */
pthread_mutex_lock (&__aio_requests_mutex);
/* Only allow writing new values if the table is not yet allocated. */
if (pool == NULL)
{
optim.aio_threads = init->aio_threads < 1 ? 1 : init->aio_threads;
optim.aio_num = (init->aio_num < ENTRIES_PER_ROW
? ENTRIES_PER_ROW
: init->aio_num & ~ENTRIES_PER_ROW);
}
/* Release the mutex. */
pthread_mutex_unlock (&__aio_requests_mutex);
}
weak_alias (__aio_init, aio_init)
/* The main function of the async I/O handling. It enqueues requests
and if necessary starts and handles threads. */
struct requestlist *
__aio_enqueue_request (aiocb_union *aiocbp, int operation)
{
int result = 0;
int policy, prio;
struct sched_param param;
struct requestlist *last, *runp, *newp;
int running = no;
if (aiocbp->aiocb.aio_reqprio < 0
|| aiocbp->aiocb.aio_reqprio > AIO_PRIO_DELTA_MAX)
{
/* Invalid priority value. */
__set_errno (EINVAL);
aiocbp->aiocb.__error_code = EINVAL;
aiocbp->aiocb.__return_value = -1;
return NULL;
}
/* Compute priority for this request. */
pthread_getschedparam (pthread_self (), &policy, &param);
prio = param.sched_priority - aiocbp->aiocb.aio_reqprio;
/* Get the mutex. */
pthread_mutex_lock (&__aio_requests_mutex);
last = NULL;
runp = requests;
/* First look whether the current file descriptor is currently
worked with. */
while (runp != NULL
&& runp->aiocbp->aiocb.aio_fildes < aiocbp->aiocb.aio_fildes)
{
last = runp;
runp = runp->next_fd;
}
/* Get a new element for the waiting list. */
newp = get_elem ();
if (newp == NULL)
{
__set_errno (EAGAIN);
pthread_mutex_unlock (&__aio_requests_mutex);
return NULL;
}
newp->aiocbp = aiocbp;
newp->waiting = NULL;
aiocbp->aiocb.__abs_prio = prio;
aiocbp->aiocb.__policy = policy;
aiocbp->aiocb.aio_lio_opcode = operation;
aiocbp->aiocb.__error_code = EINPROGRESS;
aiocbp->aiocb.__return_value = 0;
if (runp != NULL
&& runp->aiocbp->aiocb.aio_fildes == aiocbp->aiocb.aio_fildes)
{
/* 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
after finishing the current job process this request if there
are other threads in the running queue which have a higher
priority. */
/* Simply enqueue it after the running one according to the
priority. */
while (runp->next_prio != NULL
&& runp->next_prio->aiocbp->aiocb.__abs_prio >= prio)
runp = runp->next_prio;
newp->next_prio = runp->next_prio;
runp->next_prio = newp;
running = queued;
}
else
{
/* Enqueue this request for a new descriptor. */
if (last == NULL)
{
newp->last_fd = NULL;
newp->next_fd = requests;
if (requests != NULL)
requests->last_fd = newp;
requests = newp;
}
else
{
newp->next_fd = last->next_fd;
newp->last_fd = last;
last->next_fd = newp;
if (newp->next_fd != NULL)
newp->next_fd->last_fd = newp;
}
newp->next_prio = NULL;
}
if (running == no)
{
/* We try to create a new thread for this file descriptor. The
function which gets called will handle all available requests
for this descriptor and when all are processed it will
terminate.
If no new thread can be created or if the specified limit of
threads for AIO is reached we queue the request. */
/* See if we can create a thread. */
if (nthreads < optim.aio_threads)
{
pthread_t thid;
pthread_attr_t attr;
/* Make sure the thread is created detached. */
pthread_attr_init (&attr);
pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
/* Now try to start a thread. */
if (pthread_create (&thid, &attr, handle_fildes_io, newp) == 0)
{
/* We managed to enqueue the request. All errors which can
happen now can be recognized by calls to `aio_return' and
`aio_error'. */
running = allocated;
++nthreads;
}
else if (nthreads == 0)
/* We cannot create a thread in the moment and there is
also no thread running. This is a problem. `errno' is
set to EAGAIN if this is only a temporary problem. */
result = -1;
}
}
/* Enqueue the request in the run queue if it is not yet running. */
if (running < yes && result == 0)
{
if (runlist == NULL || runlist->aiocbp->aiocb.__abs_prio < prio)
{
newp->next_run = runlist;
runlist = newp;
}
else
{
runp = runlist;
while (runp->next_run != NULL
&& runp->next_run->aiocbp->aiocb.__abs_prio >= prio)
runp = runp->next_run;
newp->next_run = runp->next_run;
runp->next_run = newp;
}
}
if (result == 0)
newp->running = running;
else
{
/* Something went wrong. */
__aio_free_request (newp);
newp = NULL;
}
/* Release the mutex. */
pthread_mutex_unlock (&__aio_requests_mutex);
return newp;
}
static void *
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;
int policy;
int fildes = runp->aiocbp->aiocb.aio_fildes;
pthread_getschedparam (self, &policy, &param);
do
{
/* Change the priority to the requested value (if necessary). */
if (aiocbp->aiocb.__abs_prio != param.sched_priority
|| aiocbp->aiocb.__policy != policy)
{
param.sched_priority = aiocbp->aiocb.__abs_prio;
policy = aiocbp->aiocb.__policy;
pthread_setschedparam (self, policy, &param);
}
/* Process request pointed to by RUNP. We must not be disturbed
by signals. */
if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_READ)
{
if (aiocbp->aiocb.aio_lio_opcode & 128)
aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (__pread64 (fildes,
(void *) aiocbp->aiocb64.aio_buf,
aiocbp->aiocb64.aio_nbytes,
aiocbp->aiocb64.aio_offset));
else
aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (pread (fildes,
(void *) aiocbp->aiocb.aio_buf,
aiocbp->aiocb.aio_nbytes,
aiocbp->aiocb.aio_offset));
}
else if ((aiocbp->aiocb.aio_lio_opcode & 127) == LIO_WRITE)
{
if (aiocbp->aiocb.aio_lio_opcode & 128)
aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (__pwrite64 (fildes,
(const void *) aiocbp->aiocb64.aio_buf,
aiocbp->aiocb64.aio_nbytes,
aiocbp->aiocb64.aio_offset));
else
aiocbp->aiocb.__return_value =
TEMP_FAILURE_RETRY (pwrite (fildes,
(const void *) aiocbp->aiocb.aio_buf,
aiocbp->aiocb.aio_nbytes,
aiocbp->aiocb.aio_offset));
}
else if (aiocbp->aiocb.aio_lio_opcode == LIO_DSYNC)
aiocbp->aiocb.__return_value = TEMP_FAILURE_RETRY (fdatasync (fildes));
else if (aiocbp->aiocb.aio_lio_opcode == LIO_SYNC)
aiocbp->aiocb.__return_value = TEMP_FAILURE_RETRY (fsync (fildes));
else
{
/* This is an invalid opcode. */
aiocbp->aiocb.__return_value = -1;
__set_errno (EINVAL);
}
/* Get the mutex. */
pthread_mutex_lock (&__aio_requests_mutex);
if (aiocbp->aiocb.__return_value == -1)
aiocbp->aiocb.__error_code = errno;
else
aiocbp->aiocb.__error_code = 0;
/* Send the signal to notify about finished processing of the
request. */
__aio_notify (runp);
/* Now dequeue the current request. */
if (runp->next_prio == NULL)
{
/* No outstanding request for this descriptor. Process the
runlist if necessary. */
if (runp->next_fd != NULL)
runp->next_fd->last_fd = runp->last_fd;
if (runp->last_fd != NULL)
runp->last_fd->next_fd = runp->next_fd;
}
else
{
runp->next_prio->last_fd = runp->last_fd;
runp->next_prio->next_fd = runp->next_fd;
runp->next_prio->running = yes;
if (runp->next_fd != NULL)
runp->next_fd->last_fd = runp->next_prio;
if (runp->last_fd != NULL)
runp->last_fd->next_fd = runp->next_prio;
}
/* Free the old element. */
__aio_free_request (runp);
runp = freelist;
if (runp != NULL)
{
/* We must not run requests which are not marked `running'. */
if (runp->running == yes)
{
freelist = runp->next_run;
runp->running = allocated;
}
else
{
struct requestlist *old;
do
{
old = runp;
runp = runp->next_run;
}
while (runp != NULL && runp->running != yes);
if (runp != NULL)
old->next_run = runp->next_run;
}
}
/* If no request to work on we will stop the thread. */
if (runp == NULL)
--nthreads;
/* Release the mutex. */
pthread_mutex_unlock (&__aio_requests_mutex);
}
while (runp != NULL);
pthread_exit (NULL);
}
/* Free allocated resources. */
static void
__attribute__ ((unused))
free_res (void)
{
size_t row;
/* The first block of rows as specified in OPTIM is allocated in
one chunk. */
free (pool[0]);
for (row = optim.aio_num / ENTRIES_PER_ROW; row < pool_tab_size; ++row)
free (pool[row]);
free (pool);
}
text_set_element (__libc_subfreeres, free_res);