From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org, Carlos O'Donell <carlos@redhat.com>
Subject: Re: [PATCH v2 17/25] y2038: Add __USE_TIME_BITS64 support for socket-constants.h
Date: Wed, 19 May 2021 11:13:18 +0200 [thread overview]
Message-ID: <20210519111318.17937399@ktm> (raw)
In-Reply-To: <20210518205613.1487824-18-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 9803 bytes --]
On Tue, 18 May 2021 17:56:05 -0300
Adhemerval Zanella <adhemerval.zanella@linaro.org> 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.
>
> 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 <lukma@denx.de>
> ---
> .../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(-)
>
> 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 == 64 && __WORDSIZE == 32 \
> - && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 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 == 64 && __WORDSIZE == 32 \
> && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 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 == 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 == 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 == 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 == 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 == 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-05-19 9:13 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 20:55 [PATCH v2 00/25] Add 64 bit time support on legacy ABIs Adhemerval Zanella
2021-05-18 20:55 ` [PATCH v2 01/25] linux: mips: Split libpthread.abilist in n32 and n64 Adhemerval Zanella
2021-05-19 8:24 ` Lukasz Majewski
2021-05-20 6:38 ` Florian Weimer
2021-05-20 10:43 ` Adhemerval Zanella
2021-06-04 19:29 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 02/25] linux: mips: Split librt.abilist " Adhemerval Zanella
2021-05-19 8:25 ` Lukasz Majewski
2021-06-04 19:29 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 03/25] linux: mips: Split libanl.abilist " Adhemerval Zanella
2021-05-19 8:25 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 04/25] linux: s390: Add libanl.abilist in s390 and s390x Adhemerval Zanella
2021-05-19 8:26 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Adhemerval Zanella
2021-05-19 8:36 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Lukasz Majewski
2021-05-20 6:44 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Florian Weimer
2021-05-20 18:01 ` Adhemerval Zanella
2021-05-21 18:37 ` Florian Weimer
2021-05-21 19:17 ` Adhemerval Zanella
2021-06-04 19:30 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Carlos O'Donell
2021-06-07 17:52 ` Adhemerval Zanella
2021-05-18 20:55 ` [PATCH v2 06/25] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2021-05-19 8:50 ` Lukasz Majewski
2021-05-20 6:50 ` Florian Weimer
2021-05-20 18:46 ` Adhemerval Zanella
2021-05-21 18:38 ` Florian Weimer
2021-05-21 19:02 ` Adhemerval Zanella
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 07/25] linux: Add recvvmsg " Adhemerval Zanella
2021-05-19 9:02 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 08/25] y2038: Add __USE_TIME_BITS64 support for time_t Adhemerval Zanella
2021-05-19 9:02 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 09/25] y2038: Add __USE_TIME_BITS64 support for struct timeval Adhemerval Zanella
2021-05-19 9:03 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 10/25] y2038: Add __USE_TIME_BITS64 support for struct timespec Adhemerval Zanella
2021-05-19 9:03 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 11/25] y2038: Add __USE_TIME_BITS64 support for struct utimbuf Adhemerval Zanella
2021-05-19 9:04 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 12/25] y2038: linux: Add __USE_TIME_BITS64 support for struct timex Adhemerval Zanella
2021-05-19 9:04 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 13/25] y2038: Use a common definition for stat Adhemerval Zanella
2021-06-04 19:37 ` Carlos O'Donell
2021-06-07 18:07 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 14/25] y2038: Use a common definition for msqid_ds Adhemerval Zanella
2021-06-04 19:38 ` Carlos O'Donell
2021-06-07 18:29 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 15/25] y2038: Use a common definition for semid_ds Adhemerval Zanella
2021-05-19 9:09 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-06-07 18:46 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 16/25] y2038: Use a common definition for shmid_ds Adhemerval Zanella
2021-05-19 9:09 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 17/25] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Adhemerval Zanella
2021-05-19 9:13 ` Lukasz Majewski [this message]
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 18/25] time: Add 64 bit time support for getdate Adhemerval Zanella
2021-05-19 9:15 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 19/25] y2038: Add support for 64 bit time on legacy ABIs Adhemerval Zanella
2021-05-19 9:18 ` Lukasz Majewski
2021-05-20 6:58 ` Florian Weimer
2021-05-20 10:37 ` Adhemerval Zanella
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 20/25] posix: Add glob64 with 64 bit time_t support Adhemerval Zanella
2021-05-19 10:44 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-06-07 18:52 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 21/25] io: Add fts64 " Adhemerval Zanella
2021-05-19 10:50 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 22/25] io: Add ftw64 " Adhemerval Zanella
2021-05-19 10:57 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 23/25] libsupport: Add 64 bit time_t support for time functions Adhemerval Zanella
2021-05-19 11:00 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 24/25] libsupport: Add 64 bit time_t support for stat functions Adhemerval Zanella
2021-05-19 11:04 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 25/25] y2038: Add test coverage Adhemerval Zanella
2021-05-19 11:08 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-06-04 19:29 ` [PATCH v2 00/25] Add 64 bit time support on legacy ABIs Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210519111318.17937399@ktm \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).