AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Really implement fallocate{,64} and sync_file_range as cancellation points.

Browse Source
This commit is contained in:
Ulrich Drepper 2011-04-01 11:15:08 -04:00
parent 6e63d5e1ae
commit 748876bf1c
9 changed files with 130 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,7 +1,20 @@
2011-04-01 Ulrich Drepper <drepper@gmail.com>
* io/Makefile: Compile fallocate.c, fallocate64.c, and
sync_file_range.c with -fexceptions.
* sysdeps/unix/sysv/linux/fallocate.c: Make cancelable.
* sysdeps/unix/sysv/linux/fallocate64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/fallocate.c: Likewise.
* sysdeps/unix/sysv/linux/i386/fallocate64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise.
* sysdeps/unix/sysv/linux/sync_file_range.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Mark
sync_file_range as cancellation point.
2011-04-01 Andreas Schwab <schwab@redhat.com> 2011-04-01 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
bits/timex.h bits/timex.h.
2011-04-01 Ulrich Drepper <drepper@gmail.com> 2011-04-01 Ulrich Drepper <drepper@gmail.com>

5
io/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1992-2003,2005,2006,2007,2008 Free Software Foundation, Inc. # Copyright (C) 1992-2003,2005-2008,2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
@ -90,6 +90,9 @@ CFLAGS-ftw64.c = $(uses-callbacks) -fexceptions
CFLAGS-lockf.c = -fexceptions CFLAGS-lockf.c = -fexceptions
CFLAGS-posix_fallocate.c = -fexceptions CFLAGS-posix_fallocate.c = -fexceptions
CFLAGS-posix_fallocate64.c = -fexceptions CFLAGS-posix_fallocate64.c = -fexceptions
CFLAGS-fallocate.c = -fexceptions
CFLAGS-fallocate64.c = -fexceptions
CFLAGS-sync_file_range.c = -fexceptions
CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE

22
sysdeps/unix/sysv/linux/fallocate.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sysdep.h> #include <sysdep-cancel.h>
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
@ -26,9 +26,21 @@ int
fallocate (int fd, int mode, __off_t offset, __off_t len) fallocate (int fd, int mode, __off_t offset, __off_t len)
{ {
#ifdef __NR_fallocate #ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 6, fd, mode, if (SINGLE_THREAD_P)
__LONG_LONG_PAIR (offset >> 31, offset), return INLINE_SYSCALL (fallocate, 6, fd, mode,
__LONG_LONG_PAIR (len >> 31, len)); __LONG_LONG_PAIR (offset >> 31, offset),
__LONG_LONG_PAIR (len >> 31, len));
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (fallocate, 6, fd, mode,
__LONG_LONG_PAIR (offset >> 31, offset),
__LONG_LONG_PAIR (len >> 31, len));
LIBC_CANCEL_RESET (oldtype);
return result;
#else #else
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;

28
sysdeps/unix/sysv/linux/fallocate64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sysdep.h> #include <sysdep-cancel.h>
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
@ -26,11 +26,25 @@ int
fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
{ {
#ifdef __NR_fallocate #ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 6, fd, mode, if (SINGLE_THREAD_P)
__LONG_LONG_PAIR ((long int) (offset >> 32), return INLINE_SYSCALL (fallocate, 6, fd, mode,
(long int) offset), __LONG_LONG_PAIR ((long int) (offset >> 32),
__LONG_LONG_PAIR ((long int) (len >> 32), (long int) offset),
(long int) len)); __LONG_LONG_PAIR ((long int) (len >> 32),
(long int) len));
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (fallocate, 6, fd, mode,
__LONG_LONG_PAIR ((long int) (offset >> 32),
(long int) offset),
__LONG_LONG_PAIR ((long int) (len >> 32),
(long int) len));
LIBC_CANCEL_RESET (oldtype);
return result;
#else #else
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;

16
sysdeps/unix/sysv/linux/i386/fallocate.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sysdep.h> #include <sysdep-cancel.h>
extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len) extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
@ -30,7 +30,17 @@ int
fallocate (int fd, int mode, __off_t offset, __off_t len) fallocate (int fd, int mode, __off_t offset, __off_t len)
{ {
#ifdef __NR_fallocate #ifdef __NR_fallocate
int err = __call_fallocate (fd, mode, offset, len); int err;
if (SINGLE_THREAD_P)
err = __call_fallocate (fd, mode, offset, len);
else
{
int oldtype = LIBC_CANCEL_ASYNC ();
err = __call_fallocate (fd, mode, offset, len);
LIBC_CANCEL_RESET (oldtype);
}
if (__builtin_expect (err, 0)) if (__builtin_expect (err, 0))
{ {
__set_errno (err); __set_errno (err);

16
sysdeps/unix/sysv/linux/i386/fallocate64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sysdep.h> #include <sysdep-cancel.h>
extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len) extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
@ -30,7 +30,17 @@ int
fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
{ {
#ifdef __NR_fallocate #ifdef __NR_fallocate
int err = __call_fallocate (fd, mode, offset, len); int err;
if (SINGLE_THREAD_P)
err = __call_fallocate (fd, mode, offset, len);
else
{
int oldtype = LIBC_CANCEL_ASYNC ();
err = __call_fallocate (fd, mode, offset, len);
LIBC_CANCEL_RESET (oldtype);
}
if (__builtin_expect (err, 0)) if (__builtin_expect (err, 0))
{ {
__set_errno (err); __set_errno (err);

43
sysdeps/unix/sysv/linux/sync_file_range.c
View File

@ -1,5 +1,5 @@
/* Selective file content synch'ing. /* Selective file content synch'ing.
Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -21,7 +21,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sysdep.h> #include <sysdep-cancel.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -29,18 +29,43 @@
int int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{ {
return INLINE_SYSCALL (sync_file_range, 6, fd, if (SINGLE_THREAD_P)
__LONG_LONG_PAIR ((long) (from >> 32), (long) from), return INLINE_SYSCALL (sync_file_range, 6, fd,
__LONG_LONG_PAIR ((long) (to >> 32), (long) to), __LONG_LONG_PAIR ((long) (from >> 32), (long) from),
flags); __LONG_LONG_PAIR ((long) (to >> 32), (long) to),
flags);
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (sync_file_range, 6, fd,
__LONG_LONG_PAIR ((long) (from >> 32), (long) from),
__LONG_LONG_PAIR ((long) (to >> 32), (long) to),
flags);
LIBC_CANCEL_RESET (oldtype);
return result;
} }
#elif defined __NR_sync_file_range2 #elif defined __NR_sync_file_range2
int int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{ {
return INLINE_SYSCALL (sync_file_range2, 6, fd, flags, if (SINGLE_THREAD_P)
__LONG_LONG_PAIR ((long) (from >> 32), (long) from), return INLINE_SYSCALL (sync_file_range2, 6, fd, flags,
__LONG_LONG_PAIR ((long) (to >> 32), (long) to)); __LONG_LONG_PAIR ((long) (from >> 32), (long) from),
__LONG_LONG_PAIR ((long) (to >> 32), (long) to));
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (sync_file_range2, 6, fd, flags,
__LONG_LONG_PAIR ((long) (from >> 32), (long) from),
__LONG_LONG_PAIR ((long) (to >> 32), (long) to));
LIBC_CANCEL_RESET (oldtype);
return result;
} }
#else #else
int int

16
sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sysdep.h> #include <sysdep-cancel.h>
/* Reserve storage for the data of the file associated with FD. */ /* Reserve storage for the data of the file associated with FD. */
@ -26,7 +26,17 @@ int
fallocate (int fd, int mode, __off_t offset, __off_t len) fallocate (int fd, int mode, __off_t offset, __off_t len)
{ {
#ifdef __NR_fallocate #ifdef __NR_fallocate
return INLINE_SYSCALL (fallocate, 4, fd, mode, offset, len); if (SINGLE_THREAD_P)
return INLINE_SYSCALL (fallocate, 4, fd, mode, offset, len);
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (fallocate, 4, fd, mode, offset, len);
LIBC_CANCEL_RESET (oldtype);
return result;
#else #else
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;

2
sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
View File

@ -14,7 +14,7 @@ getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64
setrlimit - setrlimit i:ip __setrlimit setrlimit setrlimit64 setrlimit - setrlimit i:ip __setrlimit setrlimit setrlimit64
readahead - readahead i:iii __readahead readahead readahead - readahead i:iii __readahead readahead
sendfile - sendfile i:iipi sendfile sendfile64 sendfile - sendfile i:iipi sendfile sendfile64
sync_file_range - sync_file_range i:iiii sync_file_range sync_file_range - sync_file_range Ci:iiii sync_file_range
creat - creat Ci:si __libc_creat creat creat64 creat - creat Ci:si __libc_creat creat creat64
open - open Ci:siv __libc_open __open open __open64 open64 open - open Ci:siv __libc_open __open open __open64 open64
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64