This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Here's a patch to unify the different pread64/pwrite64 versions.
There're other functions that could use the same treatment.
Uli, is it ok to commit this?
Andreas
2000-05-26 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/i386/pread64.c: Removed, we can use the
normal version now.
* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/pwrite64.c (__libc_pwrite64): Check
endianness to check how to pass argument.
* sysdeps/unix/sysv/linux/pread64.c (__libc_pread64): Likewise.
============================================================
Index: sysdeps/unix/sysv/linux/pread64.c
--- sysdeps/unix/sysv/linux/pread64.c 2000/03/16 07:05:20 1.7
+++ sysdeps/unix/sysv/linux/pread64.c 2000/05/26 15:06:41
@@ -18,6 +18,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <endian.h>
#include <unistd.h>
#include <sysdep.h>
@@ -46,8 +47,16 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pread, 5, fd, buf, count, (off_t) (offset >> 32),
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+ result = INLINE_SYSCALL (pread, 5, fd, buf, count,
+ (off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
+# elif __BYTE_ORDER == __BIG_ENDIAN
+ result = INLINE_SYSCALL (pread, 5, fd, buf, count,
+ (off_t) (offset & 0xffffffff),
+ (off_t) (offset >> 32));
+# endif
+
# if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
============================================================
Index: sysdeps/unix/sysv/linux/pwrite64.c
--- sysdeps/unix/sysv/linux/pwrite64.c 2000/03/16 07:05:42 1.7
+++ sysdeps/unix/sysv/linux/pwrite64.c 2000/05/26 15:06:41
@@ -18,6 +18,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <endian.h>
#include <unistd.h>
#include <sysdep.h>
@@ -46,8 +47,15 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, (off_t) (offset >> 32),
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+ result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
+ (off_t) (offset & 0xffffffff),
+ (off_t) (offset >> 32));
+# elif __BYTE_ORDER == __BIG_ENDIAN
+ result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
+ (off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
+# endif
# if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
============================================================
Index: sysdeps/unix/sysv/linux/mips/pread64.c
--- sysdeps/unix/sysv/linux/mips/pread64.c Thu Mar 16 09:24:35 2000 1.1
+++ sysdeps/unix/sysv/linux/mips/pread64.c removed
@@ -1,75 +0,0 @@
-/* Copyright (C) 1997, 1998, 2000 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 <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
-
-# if __ASSUME_PREAD_SYSCALL == 0
-static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
- off64_t offset) internal_function;
-# endif
-
-extern ssize_t __syscall_pread (int fd, void *buf, size_t count, int dummy,
- off_t offset_hi, off_t offset_lo);
-
-
-
-ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
-{
- ssize_t result;
-
- /* First try the syscall. */
-# if defined(__MIPSEB__)
- result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0, (off_t) (offset >> 32),
- (off_t) (offset & 0xffffffff));
-# elif defined(__MIPSEL__)
- result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0,
- (off_t) (offset & 0xffffffff),
- (off_t) (offset >> 32));
-# endif
-# if __ASSUME_PREAD_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pread64 (fd, buf, count, offset);
-# endif
- return result;
-}
-
-weak_alias (__libc_pread64, __pread64)
-weak_alias (__libc_pread64, pread64)
-
-# define __libc_pread64(fd, buf, count, offset) \
- static internal_function __emulate_pread64 (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PREAD_SYSCALL == 0
-# include <sysdeps/posix/pread64.c>
-#endif
============================================================
Index: sysdeps/unix/sysv/linux/mips/pwrite64.c
--- sysdeps/unix/sysv/linux/mips/pwrite64.c Thu Mar 16 09:24:35 2000 1.1
+++ sysdeps/unix/sysv/linux/mips/pwrite64.c removed
@@ -1,75 +0,0 @@
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ralf Baechle <ralf@gnu.org>, 1998.
-
- 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 <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
-
-extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t count,
- int dummy, off_t offset_hi, off_t offset_lo);
-
-# if __ASSUME_PWRITE_SYSCALL == 0
-static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
- off64_t offset) internal_function;
-# endif
-
-ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
-{
- ssize_t result;
-
- /* First try the syscall. */
-# if defined(__MIPSEB__)
- result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0, (off_t) (offset >> 32),
- (off_t) (offset & 0xffffffff));
-# elif defined(__MIPSEL__)
- result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0,
- (off_t) (offset & 0xffffffff),
- (off_t) (offset >> 32));
-# endif
-
-# if __ASSUME_PWRITE_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pwrite64 (fd, buf, count, offset);
-# endif
-
- return result;
-}
-
-weak_alias (__libc_pwrite64, __pwrite64)
-weak_alias (__libc_pwrite64, pwrite64)
-
-# define __libc_pwrite64(fd, buf, count, offset) \
- static internal_function __emulate_pwrite64 (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PWRITE_SYSCALL == 0
-# include <sysdeps/posix/pwrite64.c>
-#endif
============================================================
Index: sysdeps/unix/sysv/linux/i386/pread64.c
--- sysdeps/unix/sysv/linux/i386/pread64.c Fri May 26 17:06:28 2000 1.1
+++ sysdeps/unix/sysv/linux/i386/pread64.c removed
@@ -1,67 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 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 <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
-
-# if __ASSUME_PREAD_SYSCALL == 0
-static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
- off64_t offset) internal_function;
-# endif
-
-
-ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
-{
- ssize_t result;
-
- /* First try the syscall. */
- result = INLINE_SYSCALL (pread, 5, fd, buf, count,
- (off_t) (offset & 0xffffffff),
- (off_t) (offset >> 32));
-# if __ASSUME_PREAD_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pread64 (fd, buf, count, offset);
-# endif
-
- return result;
-}
-
-weak_alias (__libc_pread64, __pread64)
-weak_alias (__libc_pread64, pread64)
-
-# define __libc_pread64(fd, buf, count, offset) \
- static internal_function __emulate_pread64 (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PREAD_SYSCALL == 0
-# include <sysdeps/posix/pread64.c>
-#endif
============================================================
Index: sysdeps/unix/sysv/linux/i386/pwrite64.c
--- sysdeps/unix/sysv/linux/i386/pwrite64.c Fri May 26 17:06:14 2000 1.1
+++ sysdeps/unix/sysv/linux/i386/pwrite64.c removed
@@ -1,67 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 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 <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
-
-# if __ASSUME_PWRITE_SYSCALL == 0
-static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
- off64_t offset) internal_function;
-# endif
-
-
-ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
-{
- ssize_t result;
-
- /* First try the syscall. */
- result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
- (off_t) (offset & 0xffffffff),
- (off_t) (offset >> 32));
-# if __ASSUME_PWRITE_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pwrite64 (fd, buf, count, offset);
-# endif
-
- return result;
-}
-
-weak_alias (__libc_pwrite64, __pwrite64)
-weak_alias (__libc_pwrite64, pwrite64)
-
-# define __libc_pwrite64(fd, buf, count, offset) \
- static internal_function __emulate_pwrite64 (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PWRITE_SYSCALL == 0
-# include <sysdeps/posix/pwrite64.c>
-#endif
============================================================
Index: sysdeps/unix/sysv/linux/arm/pread64.c
--- sysdeps/unix/sysv/linux/arm/pread64.c Mon Jan 4 10:31:32 1999 1.1
+++ sysdeps/unix/sysv/linux/arm/pread64.c removed
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/pread64.c>
============================================================
Index: sysdeps/unix/sysv/linux/arm/pwrite64.c
--- sysdeps/unix/sysv/linux/arm/pwrite64.c Mon Jan 4 10:31:41 1999 1.1
+++ sysdeps/unix/sysv/linux/arm/pwrite64.c removed
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/pwrite64.c>
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |