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 014B9386FC0C for ; Wed, 19 May 2021 09:13:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 014B9386FC0C 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 DECF181E77; Wed, 19 May 2021 11:13:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1621415599; bh=iB3QaHAZhFyO0VMxo1M/kFZhKQpvgpK2hqg5AFN3kYU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XC6eRibchs+YB9M7odnCPblc78kwG9robGyzOFie2kU3IG2ut7ZBuqRk4jphsTRML ipm0lyD9GdtOZAE5k+BuHc767RAxv+pJ0LoEgRneY6M6FtUtiHlFUJK1G67llUqMV4 2UeGbQqxxRRN737YzdCL0rUMALLM8jmUGGyHz904frasM1RM6xFakOvrzSr+6LHh6F pEEMTaBlhqlGUVrM500Ja2XmXaK6iCuVMHAkgiz0PbVBkge8JcPvUyZoU+79QMXhXV hEQgFqQ7IuFVk23HgBiamd20LtexQPoWkL3/78OEJldrti5E7mShrWcz/er8w1s4wI mttZGrpJ5VE2w== Date: Wed, 19 May 2021 11:13:18 +0200 From: Lukasz Majewski To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Carlos O'Donell Subject: Re: [PATCH v2 17/25] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Message-ID: <20210519111318.17937399@ktm> In-Reply-To: <20210518205613.1487824-18-adhemerval.zanella@linaro.org> References: <20210518205613.1487824-1-adhemerval.zanella@linaro.org> <20210518205613.1487824-18-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_/U=h5vHejH+JipO/vIwsNTD4"; 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, 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:13:22 -0000 --Sig_/U=h5vHejH+JipO/vIwsNTD4 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 18 May 2021 17:56:05 -0300 Adhemerval Zanella wrote: > It is only used for !__USE_MISC, the default way uses the kernel > headers. The patch also adds the SO_TIMESTAMP, SO_TIMESTAMPNS, and > SO_TIMESTAMPING which uses new values for 64 bit time_t kernel > interfaces. >=20 > The __USE_TIME_BITS64 is not defined internally yet, although the > internal header is used when building the 64-bit stat implementations. Reviewed-by: Lukasz Majewski > --- > .../unix/sysv/linux/bits/socket-constants.h | 47 > +++++++++++++++---- .../sysv/linux/hppa/bits/socket-constants.h | > 36 +++++++++++++- .../sysv/linux/mips/bits/socket-constants.h | 36 > +++++++++++++- .../linux/powerpc/bits/socket-constants.h | 36 > +++++++++++++- .../sysv/linux/sparc/bits/socket-constants.h | 36 > +++++++++++++- 5 files changed, 175 insertions(+), 16 deletions(-) >=20 > diff --git a/sysdeps/unix/sysv/linux/bits/socket-constants.h > b/sysdeps/unix/sysv/linux/bits/socket-constants.h index > 84f7a333a2..c52e72bb73 100644 --- > a/sysdeps/unix/sysv/linux/bits/socket-constants.h +++ > b/sysdeps/unix/sysv/linux/bits/socket-constants.h @@ -32,19 +32,50 @@ > #define SO_OOBINLINE 10 > #define SO_RCVBUF 8 > #define SO_RCVLOWAT 18 > -#if (__TIMESIZE =3D=3D 64 && __WORDSIZE =3D=3D 32 \ > - && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE =3D=3D 32)) > -# define SO_RCVTIMEO 66 > -#else > -# define SO_RCVTIMEO 20 > -#endif > #define SO_REUSEADDR 2 > #define SO_SNDBUF 7 > #define SO_SNDLOWAT 19 > +#define SO_TYPE 3 > + > #if (__TIMESIZE =3D=3D 64 && __WORDSIZE =3D=3D 32 \ > && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE =3D=3D 32)) > +# define SO_RCVTIMEO 66 > # define SO_SNDTIMEO 67 > +# define SO_TIMESTAMP 63 > +# define SO_TIMESTAMPNS 64 > +# define SO_TIMESTAMPING 65 > #else > -# define SO_SNDTIMEO 21 > +# if __TIMESIZE =3D=3D 64 > +# define SO_RCVTIMEO 20 > +# define SO_SNDTIMEO 21 > +# define SO_TIMESTAMP 29 > +# define SO_TIMESTAMPNS 35 > +# define SO_TIMESTAMPING 37 > +# else > +# define SO_RCVTIMEO_OLD 20 > +# define SO_SNDTIMEO_OLD 21 > +# define SO_RCVTIMEO_NEW 66 > +# define SO_SNDTIMEO_NEW 67 > + > +# define SO_TIMESTAMP_OLD 29 > +# define SO_TIMESTAMPNS_OLD 35 > +# define SO_TIMESTAMPING_OLD 37 > +# define SO_TIMESTAMP_NEW 63 > +# define SO_TIMESTAMPNS_NEW 64 > +# define SO_TIMESTAMPING_NEW 65 > + > +# ifdef __USE_TIME_BITS64 > +# define SO_RCVTIMEO SO_RCVTIMEO_NEW > +# define SO_SNDTIMEO SO_SNDTIMEO_NEW > +# define SO_TIMESTAMP SO_TIMESTAMP_NEW > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_NEW > +# define SO_TIMESTAMPING SO_TIMESTAMPING_NEW > +# else > +# define SO_RCVTIMEO SO_RCVTIMEO_OLD > +# define SO_SNDTIMEO SO_SNDTIMEO_OLD > +# define SO_TIMESTAMP SO_TIMESTAMP_OLD > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD > +# define SO_TIMESTAMPING SO_TIMESTAMPING_OLD > +# endif > +# endif > #endif > -#define SO_TYPE 3 > diff --git a/sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h > b/sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h index > b4fb65b9f1..68b42d4606 100644 --- > a/sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h +++ > b/sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h @@ -30,9 > +30,41 @@ #define SO_OOBINLINE 256 > #define SO_RCVBUF 4098 > #define SO_RCVLOWAT 4100 > -#define SO_RCVTIMEO 4102 > #define SO_REUSEADDR 4 > #define SO_SNDBUF 4097 > #define SO_SNDLOWAT 4099 > -#define SO_SNDTIMEO 4101 > #define SO_TYPE 4104 > + > +#if __TIMESIZE =3D=3D 64 > +# define SO_RCVTIMEO 4102 > +# define SO_SNDTIMEO 4101 > +# define SO_TIMESTAMP 16402 > +# define SO_TIMESTAMPNS 16403 > +# define SO_TIMESTAMPING 16416 > +#else > +# define SO_RCVTIMEO_OLD 4102 > +# define SO_SNDTIMEO_OLD 4101 > +# define SO_RCVTIMEO_NEW 16448 > +# define SO_SNDTIMEO_NEW 16449 > + > +# define SO_TIMESTAMP_OLD 0x4012 > +# define SO_TIMESTAMPNS_OLD 0x4013 > +# define SO_TIMESTAMPING_OLD 0x4020 > +# define SO_TIMESTAMP_NEW 0x4038 > +# define SO_TIMESTAMPNS_NEW 0x4039 > +# define SO_TIMESTAMPING_NEW 0x403A > + > +# ifdef __USE_TIME_BITS64 > +# define SO_RCVTIMEO SO_RCVTIMEO_NEW > +# define SO_SNDTIMEO SO_SNDTIMEO_NEW > +# define SO_TIMESTAMP SO_TIMESTAMP_NEW > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_NEW > +# define SO_TIMESTAMPING SO_TIMESTAMPING_NEW > +# else > +# define SO_RCVTIMEO SO_RCVTIMEO_OLD > +# define SO_SNDTIMEO SO_SNDTIMEO_OLD > +# define SO_TIMESTAMP SO_TIMESTAMP_OLD > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD > +# define SO_TIMESTAMPING SO_TIMESTAMPING_OLD > +# endif > +#endif > diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket-constants.h > b/sysdeps/unix/sysv/linux/mips/bits/socket-constants.h index > a5264536e9..b18a854e99 100644 --- > a/sysdeps/unix/sysv/linux/mips/bits/socket-constants.h +++ > b/sysdeps/unix/sysv/linux/mips/bits/socket-constants.h @@ -30,9 > +30,41 @@ #define SO_OOBINLINE 256 > #define SO_RCVBUF 4098 > #define SO_RCVLOWAT 4100 > -#define SO_RCVTIMEO 4102 > #define SO_REUSEADDR 4 > #define SO_SNDBUF 4097 > #define SO_SNDLOWAT 4099 > -#define SO_SNDTIMEO 4101 > #define SO_TYPE 4104 > + > +#if __TIMESIZE =3D=3D 64 > +# define SO_RCVTIMEO 4102 > +# define SO_SNDTIMEO 4101 > +# define SO_TIMESTAMP 29 > +# define SO_TIMESTAMPNS 35 > +# define SO_TIMESTAMPING 37 > +#else > +# define SO_RCVTIMEO_OLD 4102 > +# define SO_SNDTIMEO_OLD 4101 > +# define SO_RCVTIMEO_NEW 66 > +# define SO_SNDTIMEO_NEW 67 > + > +# define SO_TIMESTAMP_OLD 29 > +# define SO_TIMESTAMPNS_OLD 35 > +# define SO_TIMESTAMPING_OLD 37 > +# define SO_TIMESTAMP_NEW 63 > +# define SO_TIMESTAMPNS_NEW 64 > +# define SO_TIMESTAMPING_NEW 65 > + > +# ifdef __USE_TIME_BITS64 > +# define SO_RCVTIMEO SO_RCVTIMEO_NEW > +# define SO_SNDTIMEO SO_SNDTIMEO_NEW > +# define SO_TIMESTAMP SO_TIMESTAMP_NEW > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_NEW > +# define SO_TIMESTAMPING SO_TIMESTAMPING_NEW > +# else > +# define SO_RCVTIMEO SO_RCVTIMEO_OLD > +# define SO_SNDTIMEO SO_SNDTIMEO_OLD > +# define SO_TIMESTAMP SO_TIMESTAMP_OLD > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD > +# define SO_TIMESTAMPING SO_TIMESTAMPING_OLD > +# endif > +#endif > diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h > b/sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h index > f35488b375..c03141bb8c 100644 --- > a/sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h +++ > b/sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h @@ -30,9 > +30,41 @@ #define SO_OOBINLINE 10 > #define SO_RCVBUF 8 > #define SO_RCVLOWAT 16 > -#define SO_RCVTIMEO 18 > #define SO_REUSEADDR 2 > #define SO_SNDBUF 7 > #define SO_SNDLOWAT 17 > -#define SO_SNDTIMEO 19 > #define SO_TYPE 3 > + > +#if __TIMESIZE =3D=3D 64 > +# define SO_RCVTIMEO 18 > +# define SO_SNDTIMEO 19 > +# define SO_TIMESTAMP 29 > +# define SO_TIMESTAMPNS 35 > +# define SO_TIMESTAMPING 37 > +#else > +# define SO_RCVTIMEO_OLD 18 > +# define SO_SNDTIMEO_OLD 19 > +# define SO_RCVTIMEO_NEW 66 > +# define SO_SNDTIMEO_NEW 67 > + > +# define SO_TIMESTAMP_OLD 29 > +# define SO_TIMESTAMPNS_OLD 35 > +# define SO_TIMESTAMPING_OLD 37 > +# define SO_TIMESTAMP_NEW 63 > +# define SO_TIMESTAMPNS_NEW 64 > +# define SO_TIMESTAMPING_NEW 65 > + > +# ifdef __USE_TIME_BITS64 > +# define SO_RCVTIMEO SO_RCVTIMEO_NEW > +# define SO_SNDTIMEO SO_SNDTIMEO_NEW > +# define SO_TIMESTAMP SO_TIMESTAMP_NEW > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_NEW > +# define SO_TIMESTAMPING SO_TIMESTAMPING_NEW > +# else > +# define SO_RCVTIMEO SO_RCVTIMEO_OLD > +# define SO_SNDTIMEO SO_SNDTIMEO_OLD > +# define SO_TIMESTAMP SO_TIMESTAMP_OLD > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD > +# define SO_TIMESTAMPING SO_TIMESTAMPING_OLD > +# endif > +#endif > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h > b/sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h index > a58d0b5f96..5c4ed76c8c 100644 --- > a/sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h +++ > b/sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h @@ -30,9 > +30,41 @@ #define SO_OOBINLINE 256 > #define SO_RCVBUF 4098 > #define SO_RCVLOWAT 2048 > -#define SO_RCVTIMEO 8192 > #define SO_REUSEADDR 4 > #define SO_SNDBUF 4097 > #define SO_SNDLOWAT 4096 > -#define SO_SNDTIMEO 16384 > #define SO_TYPE 4104 > + > +#if __TIMESIZE =3D=3D 64 > +# define SO_RCVTIMEO 8192 > +# define SO_SNDTIMEO 16384 > +# define SO_TIMESTAMP 29 > +# define SO_TIMESTAMPNS 33 > +# define SO_TIMESTAMPING 35 > +#else > +# define SO_RCVTIMEO_OLD 8192 > +# define SO_SNDTIMEO_OLD 16384 > +# define SO_RCVTIMEO_NEW 68 > +# define SO_SNDTIMEO_NEW 69 > + > +# define SO_TIMESTAMP_OLD 0x001d > +# define SO_TIMESTAMPNS_OLD 0x0021 > +# define SO_TIMESTAMPING_OLD 0x0023 > +# define SO_TIMESTAMP_NEW 0x0046 > +# define SO_TIMESTAMPNS_NEW 0x0042 > +# define SO_TIMESTAMPING_NEW 0x0043 > + > +# ifdef __USE_TIME_BITS64 > +# define SO_RCVTIMEO SO_RCVTIMEO_NEW > +# define SO_SNDTIMEO SO_SNDTIMEO_NEW > +# define SO_TIMESTAMP SO_TIMESTAMP_NEW > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_NEW > +# define SO_TIMESTAMPING SO_TIMESTAMPING_NEW > +# else > +# define SO_RCVTIMEO SO_RCVTIMEO_OLD > +# define SO_SNDTIMEO SO_SNDTIMEO_OLD > +# define SO_TIMESTAMP SO_TIMESTAMP_OLD > +# define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD > +# define SO_TIMESTAMPING SO_TIMESTAMPING_OLD > +# endif > +#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_/U=h5vHejH+JipO/vIwsNTD4 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmCk1q4ACgkQAR8vZIA0 zr2luAf9FUzAi35p5+EGeSy86aaWwhd0PvLla9SQyKHWxJPYyuup2zK88V6/KYMi kFlS65T11vgIz5xPW8EcYo+KxFSOVLlzhIR7ZlHY8OXHIn3Z7Rh0CwP+Cq08NCkM mtsN5wQndvsJ5JA6frmgtA5H/1wdHTK80Hm3Rlkh4ElE1mqxT4etozghtbNBQULB 3hpSfEd0cs0roXgHOrwee2wPItzRC/tH3VPA++6YUPzyzwGT/g8a6PTBtK6kCzzL DJ3BtecJ0orqkQyPA3/xaLGUXT90gBBeHz3ra02S5hFhux7t1XUDJ6qOC73FHNPX r6FdB3mLS7yhUsrLrxvFh4cuvz3Qvg== =KoSB -----END PGP SIGNATURE----- --Sig_/U=h5vHejH+JipO/vIwsNTD4--