Consolidate Linux msgrcv implementation
This patch consolidates the msgrcv Linux implementation in only one default file, sysdeps/unix/sysv/linux/msgrcv.c. If tries to use the direct syscall if it is supported, otherwise will use the old ipc multiplex mechanism. Checked on x86_64, i686, powerpc64le, aarch64, and armhf. * sysdeps/unix/sysv/linux/alpha/syscalls.list (msgctl): Remove. * sysdeps/unix/sysv/linux/arm/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/generic/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/hppa/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/ia64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/microblaze/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (msgctl): Likewise, * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/msgrcv.c (__libc_msgrcv): Use msgrcv syscall if defined. * sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: Remove file.
This commit is contained in:
Adhemerval Zanella
parent
356c0aabd0
commit
dee23189ae
15
ChangeLog
15
ChangeLog
|
|
@ -1,5 +1,20 @@
|
|||
2016-12-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/syscalls.list (msgctl): Remove.
|
||||
* sysdeps/unix/sysv/linux/arm/syscalls.list (msgctl): Likewise.
|
||||
* sysdeps/unix/sysv/linux/generic/syscalls.list (msgctl): Likewise.
|
||||
* sysdeps/unix/sysv/linux/hppa/syscalls.list (msgctl): Likewise.
|
||||
* sysdeps/unix/sysv/linux/ia64/syscalls.list (msgctl): Likewise.
|
||||
* sysdeps/unix/sysv/linux/microblaze/syscalls.list (msgctl): Likewise.
|
||||
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (msgctl):
|
||||
Likewise.
|
||||
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (msgctl): Likewise,
|
||||
* sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (msgctl):
|
||||
Likewise.
|
||||
* sysdeps/unix/sysv/linux/msgrcv.c (__libc_msgrcv): Use msgrcv syscall
|
||||
if defined.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: Remove file.
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/Makefile (sysdeps_routines): Remove
|
||||
oldmsgctl.
|
||||
* sysdeps/unix/sysv/linux/alpha/msgctl.c: Remove file.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# File name Caller Syscall name # args Strong name Weak names
|
||||
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - osf_shmat i:ipi __shmat shmat
|
||||
oldshmctl EXTRA shmctl i:iip __old_shmctl shmctl@GLIBC_2.0
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ personality EXTRA personality Ei:i __personality personality
|
|||
# Semaphore and shm system calls. msgctl, shmctl, and semctl have C
|
||||
# wrappers (to set __IPC_64).
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmdt - shmdt i:s __shmdt shmdt
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# SysV APIs
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
semget - semget i:iii __semget semget
|
||||
semctl - semctl i:iiii __semctl semctl
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# semaphore and shm system calls
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmctl - shmctl i:iip __shmctl shmctl
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ getpriority - getpriority i:ii __getpriority getpriority
|
|||
|
||||
# semaphore and shm system calls
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmctl - shmctl i:iip __shmctl shmctl
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ personality EXTRA personality Ei:i __personality personality
|
|||
# Semaphore and shm system calls. msgctl, shmctl, and semctl have C
|
||||
# wrappers (to set __IPC_64).
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmdt - shmdt i:s __shmdt shmdt
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
# Semaphore and shm system calls. msgctl, shmctl, and semctl have C
|
||||
# wrappers (to set __IPC_64).
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmdt - shmdt i:s __shmdt shmdt
|
||||
|
|
|
|||
|
|
@ -16,33 +16,19 @@
|
|||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/msg.h>
|
||||
#include <ipc_priv.h>
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
/* Kludge to work around Linux' restriction of only up to five
|
||||
arguments to a system call. */
|
||||
struct ipc_kludge
|
||||
{
|
||||
void *msgp;
|
||||
long int msgtyp;
|
||||
};
|
||||
|
||||
|
||||
ssize_t
|
||||
__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
|
||||
int msgflg)
|
||||
{
|
||||
/* The problem here is that Linux' calling convention only allows up to
|
||||
fives parameters to a system call. */
|
||||
struct ipc_kludge tmp;
|
||||
|
||||
tmp.msgp = msgp;
|
||||
tmp.msgtyp = msgtyp;
|
||||
|
||||
return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg, &tmp);
|
||||
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|
||||
return SYSCALL_CANCEL (msgrcv, msqid, msgp, msgsz, msgtyp, msgflg);
|
||||
#else
|
||||
return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg,
|
||||
MSGRCV_ARGS (msgp, msgtyp));
|
||||
#endif
|
||||
}
|
||||
weak_alias (__libc_msgrcv, msgrcv)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# semaphore and shm system calls
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
shmat - shmat i:ipi __shmat shmat
|
||||
shmctl - shmctl i:iip __shmctl shmctl
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
/* Copyright (C) 2010-2016 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 <errno.h>
|
||||
#include <sys/msg.h>
|
||||
#include <ipc_priv.h>
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
ssize_t
|
||||
__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
|
||||
int msgflg)
|
||||
{
|
||||
return SYSCALL_CANCEL (ipc, IPCOP_msgrcv, msqid, msgsz, msgflg,
|
||||
msgp, msgtyp);
|
||||
}
|
||||
weak_alias (__libc_msgrcv, msgrcv)
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
arch_prctl EXTRA arch_prctl i:ii __arch_prctl arch_prctl
|
||||
modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
|
||||
msgget - msgget i:ii __msgget msgget
|
||||
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
|
||||
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
|
||||
pread64 - pread64 Ci:ipii __libc_pread __libc_pread64 __pread64 pread64 __pread pread
|
||||
preadv64 - preadv Ci:ipii preadv64 preadv
|
||||
|
|
|
|||
Loading…
Reference in New Issue