qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make MIPS fallocate, fallocate64 and sync_file_range cancellation points.

This commit is contained in:
Joseph Myers 2011-04-01 16:11:19 +00:00
parent 6d9a4e5564
commit 0f53d140ec
6 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog.mips
View File

@ -1,3 +1,14 @@
2011-04-01 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c: Make
cancelable.
* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list: Mark
sync_file_range as cancellation point.
* sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list: Mark
sync_file_range as cancellation point.
2011-04-01 Joseph Myers <joseph@codesourcery.com> 2011-04-01 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list: Add * sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list: Add

25
sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
View File

@ -1,5 +1,5 @@
/* Selective file content synch'ing. /* Selective file content synch'ing.
Copyright (C) 2006, 2007 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 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,10 +29,23 @@
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, 7, fd, 0, if (SINGLE_THREAD_P)
__LONG_LONG_PAIR ((long) (from >> 32), (long) from), return INLINE_SYSCALL (sync_file_range, 7, fd, 0,
__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, 7, fd, 0,
__LONG_LONG_PAIR ((long) (from >> 32), (long) from),
__LONG_LONG_PAIR ((long) (to >> 32), (long) to),
flags);
LIBC_CANCEL_RESET (oldtype);
return result;
} }
#else #else
int int

16
sysdeps/unix/sysv/linux/mips/mips64/n32/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;

16
sysdeps/unix/sysv/linux/mips/mips64/n32/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,7 +26,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
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/mips/mips64/n32/syscalls.list
View File

@ -1,7 +1,7 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
readahead - readahead i:iii __readahead readahead readahead - readahead i:iii __readahead readahead
sync_file_range - sync_file_range i:iiii sync_file_range sync_file_range - sync_file_range Ci:iiii sync_file_range
ftruncate - ftruncate i:ii __ftruncate ftruncate ftruncate64 __ftruncate64 ftruncate - ftruncate i:ii __ftruncate ftruncate ftruncate64 __ftruncate64
truncate - truncate i:si truncate truncate64 truncate - truncate i:si truncate truncate64

2
sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
View File

@ -1,6 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
sync_file_range - sync_file_range i:iiii sync_file_range sync_file_range - sync_file_range Ci:iiii sync_file_range
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64