From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by sourceware.org (Postfix) with ESMTPS id 5B65038930FE for ; Wed, 19 May 2021 09:09:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5B65038930FE Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lukma@denx.de Received: from ktm (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 4999F8047F; Wed, 19 May 2021 11:09:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1621415371; bh=lBn/lJ1ruW1w4ARurNx/U546aHofwaLTmFxuGxOw5m8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hVoU7P1wIohwQLXRkfG9EVHkVShzMWHo0NCtrkq98xY/thAzOgMIm1MIetiU8VJ3u NA8y/Jt8YC6RN8AR3L5zAUOFNjxhrP2u8gDbS1XAqOLtM+u2/KUSXSarncpDTsFNng 8nJi6pBpEGB+p+MblcCQ1tfABa7T+M9qO+DlMVyj/3a9NLDIbpI/R3qDEonc0mJZfg 7qljECdMRYzMWYQDO4oYCI1wODqzejdANA0dwxzarhYJ7BOlaklJeORLP86NptN3QI Pjimh+HFEUN2teWPnNwuec3OvEaDvTxM8mBVC7Dy2riRBWKHlr80C20HGknK0w5TvU FH/VohggfVr0g== Date: Wed, 19 May 2021 11:09:30 +0200 From: Lukasz Majewski To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Carlos O'Donell Subject: Re: [PATCH v2 15/25] y2038: Use a common definition for semid_ds Message-ID: <20210519110930.086c17cd@ktm> In-Reply-To: <20210518205613.1487824-16-adhemerval.zanella@linaro.org> References: <20210518205613.1487824-1-adhemerval.zanella@linaro.org> <20210518205613.1487824-16-adhemerval.zanella@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/vuiSMzGT69AacQIHv4S.qCI"; protocol="application/pgp-signature" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 09:09:34 -0000 --Sig_/vuiSMzGT69AacQIHv4S.qCI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 18 May 2021 17:56:03 -0300 Adhemerval Zanella wrote: > Instead of replicate the same definitions from struct_semid64_ds.h > on the multiple struct_semid_ds.h, use a common header which is > included when required (struct_semid64_ds_helper.h). >=20 > The __USE_TIME_BITS64 is not defined internally yet, although the > internal header is used when building the 64-bit semctl > implementation. Reviewed-by: Lukasz Majewski > --- > sysdeps/unix/sysv/linux/Makefile | 3 ++- > .../sysv/linux/bits/types/struct_semid64_ds.h | 5 +--- > .../bits/types/struct_semid64_ds_helper.h | 23 > +++++++++++++++++++ .../sysv/linux/bits/types/struct_semid_ds.h | > 10 +++++--- .../linux/hppa/bits/types/struct_semid_ds.h | 4 ++++ > .../linux/mips/bits/types/struct_semid_ds.h | 4 ++++ > .../powerpc/bits/types/struct_semid_ds.h | 10 +++++--- > .../linux/sparc/bits/types/struct_semid_ds.h | 10 +++++--- > .../linux/x86/bits/types/struct_semid_ds.h | 4 ++++ > 9 files changed, 59 insertions(+), 14 deletions(-) > create mode 100644 > sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h >=20 > diff --git a/sysdeps/unix/sysv/linux/Makefile > b/sysdeps/unix/sysv/linux/Makefile index 193b7c46b9..b599c423ed 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -102,7 +102,8 @@ sysdep_headers +=3D sys/mount.h sys/acct.h \ > bits/ipc-perm.h \ > bits/struct_stat.h \ > bits/struct_stat_time64_helper.h \ > - bits/types/struct_msqid64_ds_helper.h > + bits/types/struct_msqid64_ds_helper.h \ > + bits/types/struct_semid64_ds_helper.h > =20 > tests +=3D tst-clone tst-clone2 tst-clone3 tst-fanotify > tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max > tst-ttyname \ diff --git > a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h > b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h index > 7263e50bbf..adaee3eb9e 100644 --- > a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h +++ > b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h @@ -25,9 > +25,6 @@ #else struct __semid64_ds > { > - struct ipc_perm sem_perm; /* operation permission > struct */ > - __time64_t sem_otime; /* last semop() time > */ > - __time64_t sem_ctime; /* last time changed > by semctl() */ > - __syscall_ulong_t sem_nsems; /* number of > semaphores in set */ +# include > }; > #endif > diff --git > a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h > b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h new > file mode 100644 index 0000000000..ea60b671f1 --- /dev/null > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h > @@ -0,0 +1,23 @@ > +/* Common definitions for struct semid_ds with 64 bit time. > + Copyright (C) 2020-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 > + . */ > + > + /* Content of internal __semid64_ds. */ > + struct ipc_perm sem_perm; /* operation permission > struct */ > + __time64_t sem_otime; /* last semop() time > */ > + __time64_t sem_ctime; /* last time changed > by semctl() */ > + __syscall_ulong_t sem_nsems; /* number of > semaphores in set */ diff --git > a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h index > 2f32fa500e..a7b2c9022e 100644 --- > a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h @@ -23,17 > +23,21 @@ /* Data structure describing a set of semaphores. */ > struct semid_ds { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission struct */ > -#if __TIMESIZE =3D=3D 32 > +# if __TIMESIZE =3D=3D 32 > __time_t sem_otime; /* last semop() time */ > __syscall_ulong_t __sem_otime_high; > __time_t sem_ctime; /* last time changed by semctl() */ > __syscall_ulong_t __sem_ctime_high; > -#else > +# else > __time_t sem_otime; > __time_t sem_ctime; > -#endif > +# endif > __syscall_ulong_t sem_nsems; /* number of semaphores in set */ > __syscall_ulong_t __glibc_reserved3; > __syscall_ulong_t __glibc_reserved4; > +#endif > }; > diff --git > a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h index > 16a9735e7b..5067fb1572 100644 --- > a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h @@ -23,6 > +23,9 @@ /* Data structure describing a set of semaphores. */ struct > semid_ds { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission struct */ > __syscall_ulong_t __sem_otime_high; > __time_t sem_otime; /* last semop() time */ > @@ -31,4 +34,5 @@ struct semid_ds > __syscall_ulong_t sem_nsems; /* number of semaphores in set */ > __syscall_ulong_t __glibc_reserved3; > __syscall_ulong_t __glibc_reserved4; > +#endif > }; > diff --git > a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h index > 73587ea634..ee9a1e5e61 100644 --- > a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h @@ -23,10 > +23,14 @@ /* Data structure describing a set of semaphores. */ > struct semid_ds { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission > struct */ __time_t sem_otime; /* last semop() time */ > __time_t sem_ctime; /* last time changed by semctl() */ > __syscall_ulong_t sem_nsems; /* number of > semaphores in set */ __syscall_ulong_t __sem_otime_high; > __syscall_ulong_t __sem_ctime_high; > +#endif > }; > diff --git > a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h index > 8fdbc5d776..0c080fed61 100644 --- > a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h @@ > -23,17 +23,21 @@ /* Data structure describing a set of semaphores. > */ struct semid_ds { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission struct */ > -#if __TIMESIZE =3D=3D 32 > +# if __TIMESIZE =3D=3D 32 > __syscall_ulong_t __sem_otime_high; > __time_t sem_otime; /* last semop() time */ > __syscall_ulong_t __sem_ctime_high; > __time_t sem_ctime; /* last time changed by semctl() */ > -#else > +# else > __time_t sem_otime; /* last semop() time */ > __time_t sem_ctime; /* last time changed by semctl() */ > -#endif > +# endif > __syscall_ulong_t sem_nsems; /* number of semaphores in set */ > __syscall_ulong_t __glibc_reserved3; > __syscall_ulong_t __glibc_reserved4; > +#endif > }; > diff --git > a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h index > 6b9b3639b2..76810427f6 100644 --- > a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h @@ > -23,17 +23,21 @@ /* Data structure describing a set of semaphores. > */ struct semid_ds { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission struct */ > -#if __TIMESIZE =3D=3D 32 > +# if __TIMESIZE =3D=3D 32 > __syscall_ulong_t __sem_otime_high; > __time_t sem_otime; /* last semop() time */ > __syscall_ulong_t __sem_ctime_high; > __time_t sem_ctime; /* last time changed by semctl() */ > -#else > +# else > __time_t sem_otime; /* last semop() time */ > __time_t sem_ctime; /* last time changed by semctl() */ > -#endif > +# endif > __syscall_ulong_t sem_nsems; /* number of semaphores in set */ > __syscall_ulong_t __glibc_reserved3; > __syscall_ulong_t __glibc_reserved4; > +#endif > }; > diff --git a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h > b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h index > 90f03b2407..affd38b6bd 100644 --- > a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h +++ > b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h @@ -23,6 > +23,9 @@ /* Data structure describing a set of semaphores. */ > struct semid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm sem_perm; /* operation permission struct */ > __time_t sem_otime; /* last semop() time */ > __syscall_ulong_t __sem_otime_high; > @@ -31,4 +34,5 @@ struct semid_ds > __syscall_ulong_t sem_nsems; /* number of semaphores in set */ > __syscall_ulong_t __glibc_reserved3; > __syscall_ulong_t __glibc_reserved4; > +#endif > }; Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_/vuiSMzGT69AacQIHv4S.qCI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmCk1coACgkQAR8vZIA0 zr0cPggAl1cm2b0IjJFcDZbi9be8ju+KXL4QY97zUtKijj2MP4833bucKQHhgR3M pwCASkyrYeCz/O6dvcZ0x76Cke/Z93XsD2LSZ1to+O2AWIKHer91vT+t4ngLajvv ajg0haLMjCyJG1MM+zIC2uQzrgjeiEwxjaMU/RAV3CRKpuLQjWRsWklx7Qv3/1M+ aAvPPBYfph97HH/XhDXEmkLqUTzAxsIMFzQTT558vmyDrPXjUlMA65aa/h2ntjz3 UNbD8s6atpDhS9Gd4WKC2WvyVPlYFYXsTTphH0atAzTbRNfxjhwOU+f+y2FY4hua 1NQOGNusnPURLgZgaF05k8fs0HrKFQ== =1JWu -----END PGP SIGNATURE----- --Sig_/vuiSMzGT69AacQIHv4S.qCI--