OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also make x86 sync_file_range a cancellation point.

This commit is contained in:
Ulrich Drepper 2011-04-01 11:33:14 -04:00
parent 748876bf1c
commit 3167dad07c
4 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -9,7 +9,14 @@
* 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.
sync_file_range as cancellation point
* sysdeps/unix/sysv/linux/i386/sync_file_range.c: New file. This is
now a wrapper around __call_sync_file_range with cancellation handling.
* sysdeps/unix/sysv/linux/i386/sync_file_range.S: Renamed to ...
* sysdeps/unix/sysv/linux/i386/call_sync_file_range.S: ...this. Change
function name to __call_sync_file_range.
* sysdeps/unix/sysv/linux/i386/Makefile [subdir=io] (sysdep_routines):
Add call_sync_file_range.
2011-04-01 Andreas Schwab <schwab@redhat.com>

3
sysdeps/unix/sysv/linux/i386/Makefile
View File

@ -6,7 +6,10 @@ endif
ifeq ($(subdir),elf)
sysdep-others += lddlibc4
install-bin += lddlibc4
endif
ifeq ($(subdir),io)
sysdep_routines += call_sync_file_range
endif
ifeq ($(subdir),resource)

6
sysdeps/unix/sysv/linux/i386/sync_file_range.S → sysdeps/unix/sysv/linux/i386/call_sync_file_range.S
View File

@ -1,5 +1,5 @@
/* 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.
The GNU C Library is free software; you can redistribute it and/or
@ -23,7 +23,7 @@
.text
ENTRY (sync_file_range)
ENTRY (__call_sync_file_range)
#ifdef __NR_sync_file_range
pushl %ebx
cfi_adjust_cfa_offset (4)
@ -69,4 +69,4 @@ ENTRY (sync_file_range)
#endif
L(pseudo_end):
ret
PSEUDO_END (sync_file_range)
PSEUDO_END (__call_sync_file_range)

44
sysdeps/unix/sysv/linux/i386/sync_file_range.c Normal file
View File

@ -0,0 +1,44 @@
/* Selective file content synch'ing.
Copyright (C) 2006, 2007, 2011 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. */
#include <errno.h>
#include <fcntl.h>
#include <sysdep-cancel.h>
extern int __call_sync_file_range (int fd, off64_t offset, off64_t nbytes,
unsigned int flags)
attribute_hidden;
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{
if (SINGLE_THREAD_P)
return __call_sync_file_range (fd, from, to, flags);
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = __call_sync_file_range (fd, from, to, flags);
LIBC_CANCEL_RESET (oldtype);
return result;
}