mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 03:31:07 +00:00
356c0aabd0
This patch consolidates the msgctl Linux implementation in only one default file, sysdeps/unix/sysv/linux/msgctl.c. If tries to use the direct syscall if it is supported, otherwise will use the old ipc multiplex mechanism. The patch also simplify header inclusion and reorganize internal compat symbol to be built only if old ipc is defined. Checked on x86_64, i686, powerpc64le, aarch64, and armhf. * sysdeps/unix/sysv/linux/alpha/Makefile (sysdeps_routines): Remove oldmsgctl. * sysdeps/unix/sysv/linux/alpha/msgctl.c: Remove file. * sysdeps/unix/sysv/linux/arm/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/microblaze/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/syscalls.list (oldmsgctl): Remove. * 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/s390/s390-64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (msgctl): Likewise. * sysdeps/unix/sysv/linux/mips/mips64/msgctl.c: Use default implementation. * sysdeps/unix/sysv/linux/msgctl.c (__new_msgctl): Use msgctl syscall if defined.
72 lines
2.5 KiB
C
72 lines
2.5 KiB
C
/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
|
|
|
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 <sys/msg.h>
|
|
#include <ipc_priv.h>
|
|
#include <sysdep.h>
|
|
#include <shlib-compat.h>
|
|
#include <errno.h>
|
|
|
|
#ifndef DEFAULT_VERSION
|
|
# define DEFAULT_VERSION GLIBC_2_2
|
|
#endif
|
|
|
|
int
|
|
__new_msgctl (int msqid, int cmd, struct msqid_ds *buf)
|
|
{
|
|
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|
|
return INLINE_SYSCALL_CALL (msgctl, msqid, cmd | __IPC_64, buf);
|
|
#else
|
|
return INLINE_SYSCALL_CALL (ipc, IPCOP_msgctl, msqid, cmd | __IPC_64, 0,
|
|
buf);
|
|
#endif
|
|
}
|
|
versioned_symbol (libc, __new_msgctl, msgctl, DEFAULT_VERSION);
|
|
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
struct __old_msqid_ds
|
|
{
|
|
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
|
|
struct msg *__msg_first; /* pointer to first message on queue */
|
|
struct msg *__msg_last; /* pointer to last message on queue */
|
|
__time_t msg_stime; /* time of last msgsnd command */
|
|
__time_t msg_rtime; /* time of last msgrcv command */
|
|
__time_t msg_ctime; /* time of last change */
|
|
struct wait_queue *__wwait; /* ??? */
|
|
struct wait_queue *__rwait; /* ??? */
|
|
unsigned short int __msg_cbytes; /* current number of bytes on queue */
|
|
unsigned short int msg_qnum; /* number of messages currently on queue */
|
|
unsigned short int msg_qbytes; /* max number of bytes allowed on queue */
|
|
__ipc_pid_t msg_lspid; /* pid of last msgsnd() */
|
|
__ipc_pid_t msg_lrpid; /* pid of last msgrcv() */
|
|
};
|
|
|
|
int
|
|
attribute_compat_text_section
|
|
__old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf)
|
|
{
|
|
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|
|
return INLINE_SYSCALL_CALL (msgctl, msqid, cmd | __IPC_64, buf);
|
|
#else
|
|
return INLINE_SYSCALL_CALL (ipc, IPCOP_msgctl, msqid, cmd, 0, buf);
|
|
#endif
|
|
}
|
|
compat_symbol (libc, __old_msgctl, msgctl, GLIBC_2_0);
|
|
#endif
|