lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

y2038: Use a common definition for msqid_ds

Browse Source 
Instead of replicate the same definitions from struct_msqid64_ds.h
on the multiple struct_msqid_ds.h, use a common header which is included
when required (struct_msqid64_ds_helper.h).

The __USE_TIME_BITS64 is not defined internally yet, although the
internal header is used when building the 64-bit stat implementations.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Lukasz Majewski
2020-10-22 12:04:40 +02:00
committed by Adhemerval Zanella
parent 4e8521333b
commit b997083e3d
8 changed files with 83 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds.h
View File

@ -25,14 +25,6 @@
#else
struct __msqid64_ds
{
struct ipc_perm msg_perm; /* structure describing operation permission */
__time64_t msg_stime; /* time of last msgsnd command */
__time64_t msg_rtime; /* time of last msgsnd command */
__time64_t msg_ctime; /* time of last change */
__syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
# include <bits/types/struct_msqid64_ds_helper.h>
};
#endif

30
sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds_helper.h Normal file
View File

@ -0,0 +1,30 @@
/* Common definitions for struct msqid_ds with 64-bit time.
Copyright (C) 2021 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
<https://www.gnu.org/licenses/>. */
/* Content of internal __msqid64_ds. */
struct ipc_perm msg_perm; /* structure describing operation permission */
__time64_t msg_stime; /* time of last msgsnd command */
__time64_t msg_rtime; /* time of last msgsnd command */
__time64_t msg_ctime; /* time of last change */
__syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
unsigned long int __glibc_reserved4;
unsigned long int __glibc_reserved5;

12
sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h
View File

@ -20,23 +20,28 @@
# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
#endif
#include <bits/types/time_t.h>
/* Structure of record for one message inside the kernel.
The type `struct msg' is opaque. */
struct msqid_ds
{
#ifdef __USE_TIME_BITS64
# include <bits/types/struct_msqid64_ds_helper.h>
#else
struct ipc_perm msg_perm; /* structure describing operation permission */
#if __TIMESIZE == 32
# if __TIMESIZE == 32
__time_t msg_stime; /* time of last msgsnd command */
unsigned long int __msg_stime_high;
__time_t msg_rtime; /* time of last msgsnd command */
unsigned long int __msg_rtime_high;
__time_t msg_ctime; /* time of last change */
unsigned long int __msg_ctime_high;
#else
# else
__time_t msg_stime; /* time of last msgsnd command */
__time_t msg_rtime; /* time of last msgsnd command */
__time_t msg_ctime; /* time of last change */
#endif
# endif
__syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
@ -44,4 +49,5 @@ struct msqid_ds
__pid_t msg_lrpid; /* pid of last msgrcv() */
__syscall_ulong_t __glibc_reserved4;
__syscall_ulong_t __glibc_reserved5;
#endif
};