This is the mail archive of the libc-hacker@sources.redhat.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] |
| Other format: | [Raw text] | |
On Tue, Mar 02, 2004 at 06:44:57PM -0800, David Mosberger wrote:
> There appears to be a problem with fadvise() on ia64: glibc contains
> both posix_fadvise.o and posix_fadvise64.o:
>
> $ nm -g --defined posix_fadvise*.o
>
> posix_fadvise.o:
> 0000000000000000 T posix_fadvise
>
> posix_fadvise64.o:
> 0000000000000000 W posix_fadvise
> 0000000000000000 T posix_fadvise64
>
> The first comes from sysdeps/unix/sysv/linux/posix_fadvise.c and is
> wrong for ia64. The latter is generated based on
> sysdeps/unix/sysv/linux/ia64/syscalls.list and seems to be fine.
>
> The problem with the first stub is that it splits the 64-bit offset
> argument into two separate 32-bit arguments, which makes no sense on
> ia64.
>
> I'm not sure what the best way to fix this is. Compiling with
> -D_FILE_OFFSET_BITS=64 works around the problem, but clearly that
> shouldn't be necessary.
This fixes it for me. I don't think we can use syscalls.list mechanism
for this, unless we mandate asm/unistd.h with __NR_fadvise64 defined.
Tested on x86-64.
2004-03-03 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/x86_64/posix_fadvise64.c: New file.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (posix_fadvise64):
Remove.
* sysdeps/unix/sysv/linux/alpha/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/alpha/posix_fadvise64.c: New file.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (posix_fadvise64):
Remove.
* sysdeps/unix/sysv/linux/ia64/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/ia64/posix_fadvise64.c: New file.
* sysdeps/unix/sysv/linux/ia64/syscalls.list (posix_fadvise64):
Remove.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise64.c: New
file.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Removed.
* sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise64.c: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
(posix_fadvise64): Remove.
* sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise64.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
(posix_fadvise64): Remove.
--- libc/sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c.jj 2004-03-03 18:42:10.948910968 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c 2004-03-03 18:18:38.354343229 +0100
@@ -0,0 +1,41 @@
+/* Copyright (C) 2003, 2004 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 Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#define posix_fadvise64 __no_posix_fadvise64
+#include <errno.h>
+#include <fcntl.h>
+#include <sysdep.h>
+#undef posix_fadvise64
+
+/* Advice the system about the expected behaviour of the application with
+ respect to the file associated with FD. */
+
+int
+posix_fadvise (int fd, off_t offset, off_t len, int advise)
+{
+#ifdef __NR_fadvise64
+ INTERNAL_SYSCALL_DECL (err);
+ int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise);
+ if (INTERNAL_SYSCALL_ERROR_P (ret, err))
+ return INTERNAL_SYSCALL_ERRNO (ret, err);
+ return 0;
+#else
+ return ENOSYS;
+#endif
+}
+strong_alias (posix_fadvise, posix_fadvise64)
--- libc/sysdeps/unix/sysv/linux/x86_64/posix_fadvise64.c.jj 2004-03-03 18:42:15.856030074 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/posix_fadvise64.c 2004-03-03 18:28:30.514091123 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list.jj 2003-08-26 23:07:50.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list 2004-03-03 19:03:43.149904733 +0100
@@ -4,7 +4,6 @@ arch_prctl EXTRA arch_prctl i:ii __arch_
mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
llseek EXTRA lseek Ci:iii __libc_lseek64 __llseek llseek __lseek64 lseek64
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
pread - pread Ci:ibni __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite Ci:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs __fstatfs64 fstatfs64
--- libc/sysdeps/unix/sysv/linux/alpha/posix_fadvise.c.jj 2004-03-03 18:59:52.531275064 +0100
+++ libc/sysdeps/unix/sysv/linux/alpha/posix_fadvise.c 2004-03-03 19:00:18.397635665 +0100
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c>
+
--- libc/sysdeps/unix/sysv/linux/alpha/posix_fadvise64.c.jj 2004-03-03 18:42:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/alpha/posix_fadvise64.c 2004-03-03 18:28:30.000000000 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/alpha/syscalls.list.jj 2003-08-26 23:07:48.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/syscalls.list 2004-03-03 18:59:33.280727726 +0100
@@ -21,7 +21,6 @@ getpriority - getpriority i:ii __getprio
mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
lseek llseek -
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
pread - pread64 C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite64 C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs __fstatfs64 fstatfs64
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise.c.jj 2004-03-03 18:59:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise.c 2004-03-03 19:00:18.000000000 +0100
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c>
+
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise64.c.jj 2004-03-03 18:42:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/posix_fadvise64.c 2004-03-03 18:28:30.000000000 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list.jj 2003-09-03 13:10:52.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list 2004-03-03 19:04:50.307854738 +0100
@@ -10,7 +10,6 @@ getpeername - getpeername i:ipp __getpee
ftruncate - ftruncate 2 __ftruncate ftruncate ftruncate64 __ftruncate64
truncate - truncate 2 truncate truncate64
getrlimit - getrlimit 2 __getrlimit getrlimit getrlimit64
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
setrlimit - setrlimit 2 __setrlimit setrlimit setrlimit64
vfork - vfork 0 __vfork vfork
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise.c.jj 2004-03-03 18:59:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise.c 2004-03-03 19:00:18.000000000 +0100
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c>
+
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise64.c.jj 2004-03-03 18:42:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/posix_fadvise64.c 2004-03-03 18:28:30.000000000 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list.jj 2003-09-03 13:10:51.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list 2004-03-03 19:04:31.246275026 +0100
@@ -1,4 +0,0 @@
-# File name Caller Syscall name # args Strong name Weak names
-
-# System calls with wrappers.
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise.c.jj 2004-03-03 18:59:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise.c 2004-03-03 19:00:18.000000000 +0100
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c>
+
--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise64.c.jj 2004-03-03 18:42:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/posix_fadvise64.c 2004-03-03 18:28:30.000000000 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list.jj 2003-08-26 23:07:50.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list 2004-03-03 19:05:44.758084035 +0100
@@ -13,7 +13,6 @@ truncate - truncate 2 truncate truncate6
mmap - mmap 6 __mmap mmap __mmap64 mmap64
readahead - readahead 3 __readahead readahead
sendfile - sendfile i:iipi sendfile sendfile64
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
# Override select.S in parent directory:
select - select C:5 __select select
--- libc/sysdeps/unix/sysv/linux/ia64/posix_fadvise.c.jj 2004-03-03 18:59:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/posix_fadvise.c 2004-03-03 19:00:18.000000000 +0100
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/x86_64/posix_fadvise.c>
+
--- libc/sysdeps/unix/sysv/linux/ia64/posix_fadvise64.c.jj 2004-03-03 18:42:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/posix_fadvise64.c 2004-03-03 18:28:30.000000000 +0100
@@ -0,0 +1 @@
+/* posix_fadvise64 is in posix_fadvise.c */
--- libc/sysdeps/unix/sysv/linux/ia64/syscalls.list.jj 2003-09-02 09:09:01.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/syscalls.list 2004-03-03 19:00:48.816179543 +0100
@@ -5,7 +5,6 @@ umount2 - umount 2 __umount2 umount2
# Whee! 64-bit systems naturally implement llseek.
llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
lseek llseek -
-posix_fadvise64 - fadvise64 Vi:iiii posix_fadvise64 posix_fadvise
pread - pread C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
Jakub
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |