mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-06 12:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

sysvipc: Consolidate semtimedop s390

Browse Source 
This patch consolidates the s390-32 semtimedop implementation by defining
a arch-specific SEMTIMEDOP_IPC_ARGS to rearrange the arguments expected
by s390 Linux kABI.  The idea is to avoid have multiples semtimedop
implementation changes for Linux v5.1 change to enable wire-up sysvipc
support.

Checked with a s390-linux-gnu and s390x-linux-gnu and checking that
resulting semtimedop objects did not change.

	* sysdeps/unix/sysv/linux/ipc_priv.h (SEMTIMEDOP_IPC_ARGS): New
	define.
	* sysdpes/unix/sysv/linux/s390/ipc_priv.h: New file.
	* sysdeps/unix/sysv/linux/s390/semtimedop.c: Remove file.
	* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Use
	SEMTIMEDOP_IPC_ARGS for calls with __NR_ipc.
This commit is contained in:
Adhemerval Zanella 2019-05-15 10:23:49 -03:00
parent dfba907fed
commit 236c18e568
5 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2019-05-20 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2019-05-20 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/ipc_priv.h (SEMTIMEDOP_IPC_ARGS): New
define.
* sysdpes/unix/sysv/linux/s390/ipc_priv.h: New file.
* sysdeps/unix/sysv/linux/s390/semtimedop.c: Remove file.
* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Use
SEMTIMEDOP_IPC_ARGS for calls with __NR_ipc.
[BZ #24570] [BZ #24570]
* sysdeps/unix/sysv/linux/msgctl.c (__old_msgctl): Remove __IPC_64 * sysdeps/unix/sysv/linux/msgctl.c (__old_msgctl): Remove __IPC_64
usage. usage.

5
sysdeps/unix/sysv/linux/ipc_priv.h
View File

@ -36,4 +36,9 @@ struct __old_ipc_perm
#define MSGRCV_ARGS(__msgp, __msgtyp) \ #define MSGRCV_ARGS(__msgp, __msgtyp) \
((long int []){ (long int) __msgp, __msgtyp }) ((long int []){ (long int) __msgp, __msgtyp })
/* This macro is required to handle the s390 variants, which passes the
arguments in a different order than default. */
#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
(__nsops), 0, (__sops), (__timeout)
#include <ipc_ops.h> #include <ipc_ops.h>

29
sysdeps/unix/sysv/linux/s390/ipc_priv.h Normal file
View File

@ -0,0 +1,29 @@
/* Arch-specific SysV IPC definitions for Linux. s390 version.
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 <sysdeps/unix/sysv/linux/ipc_priv.h>
/* The s390 sys_ipc variant has only five parameters instead of six
(as for default variant). The difference is the handling of
SEMTIMEDOP where on s390 the third parameter is used as a pointer
to a struct timespec where the generic variant uses fifth parameter. */
#undef SEMTIMEDOP_IPC_ARGS
#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
(__nsops), (__timeout), (__sops)
#include <ipc_ops.h>

36
sysdeps/unix/sysv/linux/s390/semtimedop.c
View File

@ -1,36 +0,0 @@
/* Copyright (C) 2003-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
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/sem.h>
#include <ipc_priv.h>
#include <sysdep.h>
#include <errno.h>
/* Perform user-defined atomical operation of array of semaphores. */
int
semtimedop (int semid, struct sembuf *sops, size_t nsops,
const struct timespec *timeout)
{
/* The s390 sys_ipc variant has only five parameters instead of six
(as for default variant) and the only difference is the handling of
SEMTIMEDOP where on s390 the third parameter is used as a pointer
to a struct timespec where the generic variant uses fifth parameter. */
return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, nsops, timeout,
sops);
}

4
sysdeps/unix/sysv/linux/semtimedop.c
View File

@ -30,7 +30,7 @@ semtimedop (int semid, struct sembuf *sops, size_t nsops,
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS #ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout); return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout);
#else #else
return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, nsops, 0, sops, return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
timeout); SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
#endif #endif
} }