56ddf355da
2000-08-11 Ulrich Drepper <drepper@redhat.com> * rt/aio_cancel.c: If canceling a specific request which is running *really* do nothing. * rt/aio_misc.h: Add `done' to states of a request. * rt/aio_misc.c: Add several tests for the correct state. Simplify request table memory handling. 2000-08-10 Jakub Jelinek <jakub@redhat.com> * dirent/scandir.c: Use it for scandir64 and old_scandir64 as well. * dirent/scandir64.c: Move... * sysdeps/generic/scandir64.c: ...here. * dirent/alphasort64.c: Move... * sysdeps/generic/alphasort64.c: ...here. * dirent/versionsort64.c: Move... * sysdeps/generic/versionsort64.c: ...here. * sysdeps/unix/sysv/linux/i386/dirent/Versions (alphasort64, getdirentries64, readdir64, readdir64_r, scandir64, versionsort64): Export symbols at GLIBC_2.2. * sysdeps/unix/sysv/linux/powerpc/dirent/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dirent/Versions: Likewise. * include/dirent.h (__readdir64_r, __scandir64, __alphasort64, __versionsort64): Add prototypes. * io/Versions (__xstat64, __fxstat64, __lxstat64): Export at GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/kernel_stat.h (__xstat_conv): Remove unused prototype. * sysdeps/unix/sysv/linux/alpha/readdir.c: Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/readdir_r.c: Likewise. * sysdeps/unix/sysv/linux/alpha/getdents.c: New. * sysdeps/unix/sysv/linux/alpha/getdents64.c: New. * sysdeps/unix/sysv/linux/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/bits/stat.h (struct stat, struct stat64): Adjust for kernel-2.4.0-test6 layout. * sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat64): Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/i386/getdents64.c: New. * sysdeps/unix/sysv/linux/i386/olddirent.h: New. * sysdeps/unix/sysv/linux/i386/readdir64.c: New. * sysdeps/unix/sysv/linux/i386/readdir64_r.c: New. * sysdeps/unix/sysv/linux/i386/scandir64.c: New. * sysdeps/unix/sysv/linux/i386/alphasort64.c: New. * sysdeps/unix/sysv/linux/i386/versionsort64.c: New. * sysdeps/unix/sysv/linux/ia64/getdents.c: New. * sysdeps/unix/sysv/linux/ia64/getdents64.c: New. * sysdeps/unix/sysv/linux/ia64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/ia64/readdir_r.c: Include alpha/readdir_r.c. * sysdeps/unix/sysv/linux/mips/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: New. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/powerpc/scandir64.c: New. * sysdeps/unix/sysv/linux/powerpc/getdents64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: New. * sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc32/getdents64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/scandir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir_r.c: Include alpha/readdir_r.c * sysdeps/unix/sysv/linux/sparc/sparc64/getdents.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/getdents64.c: New. * sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): If _HAVE_STAT64___ST_INO and __st_ino != (uint32_t)st_ino, set st_ino from __st_ino. * sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv, xstat64_conv, xstat32_conv): Use _HAVE_STAT* macros. If _HAVE_STAT64___ST_INO, set __st_ino in addition to st_ino. * sysdeps/unix/sysv/linux/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/getdents.c: Use it for __getdents64 and __old_getdents64 as well. * sysdeps/unix/sysv/linux/getdirentries.c: Use it for getdirentries64 and old_getdirentries64 as well. * sysdeps/unix/sysv/linux/getdirentries64.c (GETDIRENTRIES, __GETDENTS): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/getdents64.c (__GETDENTS, DIRENT_TYPE): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/readdir64.c: Use sysdeps/unix/readdir.c. * sysdeps/unix/sysv/linux/readdir64_r.c: Use sysdeps/unix/readdir_r.c. * sysdeps/unix/readdir.c: Use it for readdir64 and __old_readdir64 as well. * sysdeps/unix/readdir_r.c: Use it for readdir64_r and __old_readdir64_r as well. * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_ST_INO_64_bit for kernel 2.4.1 and up. * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Add SI_KERNEL define.
128 lines
3.3 KiB
C
128 lines
3.3 KiB
C
/* Copyright (C) 1997, 1999, 2000 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
|
|
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. */
|
|
|
|
#ifndef _AIO_MISC_H
|
|
#define _AIO_MISC_H 1
|
|
|
|
#include <aio.h>
|
|
#include <pthread.h>
|
|
|
|
|
|
/* Extend the operation enum. */
|
|
enum
|
|
{
|
|
LIO_DSYNC = LIO_READ + 1,
|
|
LIO_SYNC,
|
|
LIO_READ64 = LIO_READ | 128,
|
|
LIO_WRITE64 = LIO_WRITE | 128
|
|
};
|
|
|
|
|
|
/* Union of the two request types. */
|
|
typedef union
|
|
{
|
|
struct aiocb aiocb;
|
|
struct aiocb64 aiocb64;
|
|
} aiocb_union;
|
|
|
|
|
|
/* Used to synchronize. */
|
|
struct waitlist
|
|
{
|
|
struct waitlist *next;
|
|
|
|
pthread_cond_t *cond;
|
|
volatile int *counterp;
|
|
/* The next field is used in asynchronous `lio_listio' operations. */
|
|
struct sigevent *sigevp;
|
|
/* XXX See requestlist, it's used to work around the broken signal
|
|
handling in Linux. */
|
|
pid_t caller_pid;
|
|
};
|
|
|
|
|
|
/* Status of a request. */
|
|
enum
|
|
{
|
|
no,
|
|
queued,
|
|
yes,
|
|
allocated,
|
|
done
|
|
};
|
|
|
|
|
|
/* Used to queue requests.. */
|
|
struct requestlist
|
|
{
|
|
int running;
|
|
|
|
struct requestlist *last_fd;
|
|
struct requestlist *next_fd;
|
|
struct requestlist *next_prio;
|
|
struct requestlist *next_run;
|
|
|
|
/* Pointer to the actual data. */
|
|
aiocb_union *aiocbp;
|
|
|
|
/* PID of the initiator thread.
|
|
XXX This is only necessary for the broken signal handling on Linux. */
|
|
pid_t caller_pid;
|
|
|
|
/* List of waiting processes. */
|
|
struct waitlist *waiting;
|
|
};
|
|
|
|
|
|
/* Lock for global I/O list of requests. */
|
|
extern pthread_mutex_t __aio_requests_mutex;
|
|
|
|
|
|
/* Enqueue request. */
|
|
extern struct requestlist *__aio_enqueue_request (aiocb_union *aiocbp,
|
|
int operation)
|
|
internal_function;
|
|
|
|
/* Find request entry for given AIO control block. */
|
|
extern struct requestlist *__aio_find_req (aiocb_union *elem)
|
|
internal_function;
|
|
|
|
/* Find request entry for given file descriptor. */
|
|
extern struct requestlist *__aio_find_req_fd (int fildes) internal_function;
|
|
|
|
/* Remove request from the list. */
|
|
extern void __aio_remove_request (struct requestlist *last,
|
|
struct requestlist *req, int all)
|
|
internal_function;
|
|
|
|
/* Release the entry for the request. */
|
|
extern void __aio_free_request (struct requestlist *req) internal_function;
|
|
|
|
/* Notify initiator of request and tell this everybody listening. */
|
|
extern void __aio_notify (struct requestlist *req) internal_function;
|
|
|
|
/* Notify initiator of request. */
|
|
extern int __aio_notify_only (struct sigevent *sigev, pid_t caller_pid)
|
|
internal_function;
|
|
|
|
/* Send the signal. */
|
|
extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid)
|
|
internal_function;
|
|
|
|
#endif /* aio_misc.h */
|