AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add nocancel version of pread64()

Browse Source 
This is in preparation for changes in the dynamic linker so that
pread() is used instead of lseek()+read().

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Leandro Pereira 2019-10-02 12:42:28 -04:00 committed by Carlos O'Donell
parent 2ac579f9c2
commit fed33b0fb0
6 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.old/ChangeLog.19
View File

@ -1,7 +1,3 @@
2019-10-11 Florian Weimer <fweimer@redhat.com>
* manual/startup.texi (Aborting a Program): Remove warning.
2019-10-10 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #18231]
@ -374,6 +370,7 @@
(test_memset): Likewise.
2019-10-02 Łukasz Majewski <lukma@denx.de>
* include/time.h: Add #include <bits/types/struct_timeval.h>
2019-10-02 Paul A. Clarke <pc@us.ibm.com>

2
sysdeps/generic/not-cancel.h
View File

@ -41,6 +41,8 @@
(void) __close (fd)
#define __read_nocancel(fd, buf, n) \
__read (fd, buf, n)
#define __pread64_nocancel(fd, buf, count, offset) \
__pread64 (fd, buf, count, offset)
#define __write_nocancel(fd, buf, n) \
__write (fd, buf, n)
#define __writev_nocancel_nostatus(fd, iov, n) \

4
sysdeps/unix/sysv/linux/Makefile
View File

@ -215,8 +215,8 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
close_nocancel fcntl_nocancel nanosleep_nocancel \
open_nocancel open64_nocancel \
openat_nocancel openat64_nocancel \
pause_nocancel read_nocancel waitpid_nocancel \
write_nocancel statx_cp
pause_nocancel read_nocancel pread64_nocancel \
waitpid_nocancel write_nocancel statx_cp
sysdep_headers += bits/fcntl-linux.h

1
sysdeps/unix/sysv/linux/Versions
View File

@ -182,6 +182,7 @@ libc {
__syscall_rt_sigqueueinfo;
__open_nocancel;
__read_nocancel;
__pread64_nocancel;
__close_nocancel;
__sigtimedwait;
# functions used by nscd

4
sysdeps/unix/sysv/linux/not-cancel.h
View File

@ -43,6 +43,9 @@ __typeof (openat64) __openat64_nocancel;
/* Non cancellable read syscall. */
__typeof (__read) __read_nocancel;
/* Non cancellable pread syscall (LFS version). */
__typeof (__pread64) __pread64_nocancel;
/* Uncancelable write. */
__typeof (__write) __write_nocancel;
@ -84,6 +87,7 @@ hidden_proto (__open64_nocancel)
hidden_proto (__openat_nocancel)
hidden_proto (__openat64_nocancel)
hidden_proto (__read_nocancel)
hidden_proto (__pread64_nocancel)
hidden_proto (__write_nocancel)
hidden_proto (__close_nocancel)
hidden_proto (__waitpid_nocancel)

32
sysdeps/unix/sysv/linux/pread64_nocancel.c Normal file
View File

@ -0,0 +1,32 @@
/* Linux pread64() syscall implementation -- non-cancellable.
Copyright (C) 2019 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, see
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <sysdep-cancel.h>
#include <not-cancel.h>
#ifndef __NR_pread64
# define __NR_pread64 __NR_pread
#endif
ssize_t
__pread64_nocancel (int fd, void *buf, size_t count, off64_t offset)
{
return INLINE_SYSCALL_CALL (pread64, fd, buf, count, SYSCALL_LL64_PRW (offset));
}
hidden_def (__pread64_nocancel)