* [PATCH v5 6/8] resource: Add a __rusage64 struct
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 18:14 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage Alistair Francis
` (7 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
Add a __rusage64 struct which always uses a 64-bit time_t.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
include/sys/resource.h | 110 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/include/sys/resource.h b/include/sys/resource.h
index c55d4e63bd..9d604dfe3e 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -2,6 +2,116 @@
#include <resource/sys/resource.h>
#ifndef _ISOMAC
+# include <time.h>
+# include <string.h>
+
+/* Internal version of rusage with a 64-bit time_t. */
+#if __TIMESIZE == 64
+# define __rusage64 rusage
+#else
+struct __rusage64
+ {
+ struct __timeval64 ru_utime;
+ struct __timeval64 ru_stime;
+ __extension__ union
+ {
+ long int ru_maxrss;
+ __syscall_slong_t __ru_maxrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_ixrss;
+ __syscall_slong_t __ru_ixrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_idrss;
+ __syscall_slong_t __ru_idrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_isrss;
+ __syscall_slong_t __ru_isrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_minflt;
+ __syscall_slong_t __ru_minflt_word;
+ };
+ __extension__ union
+ {
+ long int ru_majflt;
+ __syscall_slong_t __ru_majflt_word;
+ };
+ __extension__ union
+ {
+ long int ru_nswap;
+ __syscall_slong_t __ru_nswap_word;
+ };
+ __extension__ union
+ {
+ long int ru_inblock;
+ __syscall_slong_t __ru_inblock_word;
+ };
+ __extension__ union
+ {
+ long int ru_oublock;
+ __syscall_slong_t __ru_oublock_word;
+ };
+ __extension__ union
+ {
+ long int ru_msgsnd;
+ __syscall_slong_t __ru_msgsnd_word;
+ };
+ __extension__ union
+ {
+ long int ru_msgrcv;
+ __syscall_slong_t __ru_msgrcv_word;
+ };
+ __extension__ union
+ {
+ long int ru_nsignals;
+ __syscall_slong_t __ru_nsignals_word;
+ };
+ __extension__ union
+ {
+ long int ru_nvcsw;
+ __syscall_slong_t __ru_nvcsw_word;
+ };
+ __extension__ union
+ {
+ long int ru_nivcsw;
+ __syscall_slong_t __ru_nivcsw_word;
+ };
+ };
+#endif
+
+static inline void
+rusage64_to_rusage (const struct __rusage64 *restrict r64,
+ struct rusage *restrict r)
+{
+ /* Make sure the entire output structure is cleared, including
+ padding and reserved fields. */
+ memset (r, 0, sizeof *r);
+
+ r->ru_utime = valid_timeval64_to_timeval (r64->ru_utime);
+ r->ru_stime = valid_timeval64_to_timeval (r64->ru_stime);
+ r->ru_maxrss = r64->ru_maxrss;
+ r->ru_ixrss = r64->ru_ixrss;
+ r->ru_idrss = r64->ru_idrss;
+ r->ru_isrss = r64->ru_isrss;
+ r->ru_minflt = r64->ru_minflt;
+ r->ru_majflt = r64->ru_majflt;
+ r->ru_nswap = r64->ru_nswap;
+ r->ru_inblock = r64->ru_inblock;
+ r->ru_oublock = r64->ru_oublock;
+ r->ru_msgsnd = r64->ru_msgsnd;
+ r->ru_msgrcv = r64->ru_msgrcv;
+ r->ru_nsignals = r64->ru_nsignals;
+ r->ru_nvcsw = r64->ru_nvcsw;
+ r->ru_nivcsw = r64->ru_nivcsw;
+}
+
/* Prototypes repeated instead of using __typeof because
sys/resource.h is included in C++ tests, and declaring functions
with __typeof and __THROW doesn't work for C++. */
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 6/8] resource: Add a __rusage64 struct
2020-03-03 18:01 ` [PATCH v5 6/8] resource: Add a __rusage64 struct Alistair Francis
@ 2020-03-27 18:14 ` Adhemerval Zanella
0 siblings, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 18:14 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> Add a __rusage64 struct which always uses a 64-bit time_t.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/sys/resource.h | 110 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 110 insertions(+)
>
> diff --git a/include/sys/resource.h b/include/sys/resource.h
> index c55d4e63bd..9d604dfe3e 100644
> --- a/include/sys/resource.h
> +++ b/include/sys/resource.h
> @@ -2,6 +2,116 @@
> #include <resource/sys/resource.h>
>
> #ifndef _ISOMAC
> +# include <time.h>
> +# include <string.h>
> +
> +/* Internal version of rusage with a 64-bit time_t. */
> +#if __TIMESIZE == 64
> +# define __rusage64 rusage
> +#else
> +struct __rusage64
> + {
> + struct __timeval64 ru_utime;
> + struct __timeval64 ru_stime;
> + __extension__ union
> + {
> + long int ru_maxrss;
> + __syscall_slong_t __ru_maxrss_word;
> + };
> + __extension__ union
> + {
> + long int ru_ixrss;
> + __syscall_slong_t __ru_ixrss_word;
> + };
> + __extension__ union
> + {
> + long int ru_idrss;
> + __syscall_slong_t __ru_idrss_word;
> + };
> + __extension__ union
> + {
> + long int ru_isrss;
> + __syscall_slong_t __ru_isrss_word;
> + };
> + __extension__ union
> + {
> + long int ru_minflt;
> + __syscall_slong_t __ru_minflt_word;
> + };
> + __extension__ union
> + {
> + long int ru_majflt;
> + __syscall_slong_t __ru_majflt_word;
> + };
> + __extension__ union
> + {
> + long int ru_nswap;
> + __syscall_slong_t __ru_nswap_word;
> + };
> + __extension__ union
> + {
> + long int ru_inblock;
> + __syscall_slong_t __ru_inblock_word;
> + };
> + __extension__ union
> + {
> + long int ru_oublock;
> + __syscall_slong_t __ru_oublock_word;
> + };
> + __extension__ union
> + {
> + long int ru_msgsnd;
> + __syscall_slong_t __ru_msgsnd_word;
> + };
> + __extension__ union
> + {
> + long int ru_msgrcv;
> + __syscall_slong_t __ru_msgrcv_word;
> + };
> + __extension__ union
> + {
> + long int ru_nsignals;
> + __syscall_slong_t __ru_nsignals_word;
> + };
> + __extension__ union
> + {
> + long int ru_nvcsw;
> + __syscall_slong_t __ru_nvcsw_word;
> + };
> + __extension__ union
> + {
> + long int ru_nivcsw;
> + __syscall_slong_t __ru_nivcsw_word;
> + };
> + };
> +#endif
Ok.
> +
> +static inline void
> +rusage64_to_rusage (const struct __rusage64 *restrict r64,
> + struct rusage *restrict r)
> +{
> + /* Make sure the entire output structure is cleared, including
> + padding and reserved fields. */
> + memset (r, 0, sizeof *r);
> +
> + r->ru_utime = valid_timeval64_to_timeval (r64->ru_utime);
> + r->ru_stime = valid_timeval64_to_timeval (r64->ru_stime);
> + r->ru_maxrss = r64->ru_maxrss;
> + r->ru_ixrss = r64->ru_ixrss;
> + r->ru_idrss = r64->ru_idrss;
> + r->ru_isrss = r64->ru_isrss;
> + r->ru_minflt = r64->ru_minflt;
> + r->ru_majflt = r64->ru_majflt;
> + r->ru_nswap = r64->ru_nswap;
> + r->ru_inblock = r64->ru_inblock;
> + r->ru_oublock = r64->ru_oublock;
> + r->ru_msgsnd = r64->ru_msgsnd;
> + r->ru_msgrcv = r64->ru_msgrcv;
> + r->ru_nsignals = r64->ru_nsignals;
> + r->ru_nvcsw = r64->ru_nvcsw;
> + r->ru_nivcsw = r64->ru_nivcsw;
> +}
> +
> /* Prototypes repeated instead of using __typeof because
> sys/resource.h is included in C++ tests, and declaring functions
> with __typeof and __THROW doesn't work for C++. */
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
2020-03-03 18:01 ` [PATCH v5 6/8] resource: Add a __rusage64 struct Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 18:31 ` Adhemerval Zanella
2020-04-04 14:52 ` Andreas Schwab
2020-03-03 18:01 ` [PATCH v5 2/8] time: Add a timeval with a 32-bit tv_sec and tv_usec Alistair Francis
` (6 subsequent siblings)
8 siblings, 2 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
The Linux kernel expects rusage to use a 32-bit time_t, even on archs
with a 64-bit time_t (like RV32). To address this let's convert
rusage to/from 32-bit and 64-bit to ensure the kernel always gets
a 32-bit time_t.
While we are converting these functions let's also convert them to be
the y2038 safe versions. This means there is a *64 function that is
called by a backwards compatible wrapper.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
include/sys/resource.h | 11 +++++
sysdeps/unix/syscalls.list | 1 -
sysdeps/unix/sysv/linux/getrusage.c | 58 +++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/tv32-compat.h | 47 ++++++++++++++++++++++
sysdeps/unix/sysv/linux/wait4.c | 50 ++++++++++++++++++++++-
5 files changed, 164 insertions(+), 3 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/getrusage.c
diff --git a/include/sys/resource.h b/include/sys/resource.h
index 9d604dfe3e..64925f257c 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -134,5 +134,16 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
extern int __setrlimit (enum __rlimit_resource __resource,
const struct rlimit *__rlimits);
libc_hidden_proto (__setrlimit);
+
+#if __TIMESIZE == 64
+# define __getrusage64 __getrusage
+# define __wait4_time64 __wait4
+#else
+extern int __getrusage64 (enum __rusage_who who, struct __rusage64 *usage);
+libc_hidden_proto (__getrusage64)
+extern pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options,
+ struct __rusage64 *usage);
+libc_hidden_proto (__wait4_time64)
+#endif
#endif
#endif
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index d249049d6e..01c4a0e6b1 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -29,7 +29,6 @@ getpeername - getpeername i:ibN __getpeername getpeername
getpid - getpid Ei: __getpid getpid
getpriority - getpriority i:ii __getpriority getpriority
getrlimit - getrlimit i:ip __getrlimit getrlimit
-getrusage - getrusage i:ip __getrusage getrusage
getsockname - getsockname i:ibN __getsockname getsockname
getsockopt - getsockopt i:iiiBN getsockopt
getuid - getuid Ei: __getuid getuid
diff --git a/sysdeps/unix/sysv/linux/getrusage.c b/sysdeps/unix/sysv/linux/getrusage.c
new file mode 100644
index 0000000000..a4e382ed53
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/getrusage.c
@@ -0,0 +1,58 @@
+/* getrusage -- get the rusage struct. Linux version.
+ Copyright (C) 2020 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 <sys/time.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sysdep.h>
+#include <tv32-compat.h>
+
+int
+__getrusage64 (enum __rusage_who who, struct __rusage64 *usage)
+{
+#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+ return INLINE_SYSCALL_CALL (getrusage, who, usage);
+#else
+ struct __rusage32 usage32;
+ if (INLINE_SYSCALL_CALL (getrusage, who, &usage32) == -1)
+ return -1;
+
+ rusage32_to_rusage64 (&usage32, usage);
+ return 0;
+#endif
+}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__getrusage64)
+int
+__getrusage (enum __rusage_who who, struct rusage *usage)
+{
+ int ret ;
+ struct __rusage64 usage64;
+
+ ret = __getrusage64 (who, &usage64);
+
+ if (ret != 0)
+ return ret;
+
+ rusage64_to_rusage (&usage64, usage);
+
+ return ret;
+}
+#endif
+weak_alias (__getrusage, getrusage)
diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
index b8791b1db8..1ada1f729c 100644
--- a/sysdeps/unix/sysv/linux/tv32-compat.h
+++ b/sysdeps/unix/sysv/linux/tv32-compat.h
@@ -20,6 +20,7 @@
#define _TV32_COMPAT_H 1
#include <bits/types/time_t.h>
+#include <sys/resource.h>
/* Structures containing 'struct timeval' with 32-bit time_t. */
struct __itimerval32
@@ -28,4 +29,50 @@ struct __itimerval32
struct __timeval32 it_value;
};
+struct __rusage32
+{
+ struct __timeval32 ru_utime; /* user time used */
+ struct __timeval32 ru_stime; /* system time used */
+ long ru_maxrss; /* maximum resident set size */
+ long ru_ixrss; /* integral shared memory size */
+ long ru_idrss; /* integral unshared data size */
+ long ru_isrss; /* integral unshared stack size */
+ long ru_minflt; /* page reclaims */
+ long ru_majflt; /* page faults */
+ long ru_nswap; /* swaps */
+ long ru_inblock; /* block input operations */
+ long ru_oublock; /* block output operations */
+ long ru_msgsnd; /* messages sent */
+ long ru_msgrcv; /* messages received */
+ long ru_nsignals; /* signals received */
+ long ru_nvcsw; /* voluntary context switches */
+ long ru_nivcsw; /* involuntary " */
+};
+
+static inline void
+rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
+ struct __rusage64 *restrict r64)
+{
+ /* Make sure the entire output structure is cleared, including
+ padding and reserved fields. */
+ memset (r64, 0, sizeof *r64);
+
+ r64->ru_utime = valid_timeval32_to_timeval64 (r32->ru_utime);
+ r64->ru_stime = valid_timeval32_to_timeval64 (r32->ru_stime);
+ r64->ru_maxrss = r32->ru_maxrss;
+ r64->ru_ixrss = r32->ru_ixrss;
+ r64->ru_idrss = r32->ru_idrss;
+ r64->ru_isrss = r32->ru_isrss;
+ r64->ru_minflt = r32->ru_minflt;
+ r64->ru_majflt = r32->ru_majflt;
+ r64->ru_nswap = r32->ru_nswap;
+ r64->ru_inblock = r32->ru_inblock;
+ r64->ru_oublock = r32->ru_oublock;
+ r64->ru_msgsnd = r32->ru_msgsnd;
+ r64->ru_msgrcv = r32->ru_msgrcv;
+ r64->ru_nsignals = r32->ru_nsignals;
+ r64->ru_nvcsw = r32->ru_nvcsw;
+ r64->ru_nivcsw = r32->ru_nivcsw;
+}
+
#endif /* tv32-compat.h */
diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
index 3a8bed1169..da591da4d4 100644
--- a/sysdeps/unix/sysv/linux/wait4.c
+++ b/sysdeps/unix/sysv/linux/wait4.c
@@ -18,14 +18,30 @@
#include <sys/wait.h>
#include <sys/resource.h>
+#include <sys/types.h>
#include <sysdep-cancel.h>
+#include <tv32-compat.h>
pid_t
-__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
+__wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage)
{
#ifdef __NR_wait4
+# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage);
+# else
+ struct __rusage32 usage32;
+ pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
+
+ if (ret != 0)
+ return ret;
+
+ if (usage != NULL)
+ rusage32_to_rusage64 (&usage32, usage);
+
+ return ret;
+# endif
#elif defined (__ASSUME_WAITID_PID0_P_PGID)
+ struct __rusage32 usage32;
idtype_t idtype = P_PID;
if (pid < -1)
@@ -41,7 +57,12 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
options |= WEXITED;
siginfo_t infop;
+
+# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0)
+# else
+ if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0)
+# endif
return -1;
if (stat_loc)
@@ -70,8 +91,13 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
}
}
+# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 == 0
+ if (usage != NULL)
+ rusage32_to_rusage64 (&usage32, usage);
+# endif
+
return infop.si_pid;
-# else
+#else
/* Linux waitid prior kernel 5.4 does not support waiting for the current
process. It is possible to emulate wait4 it by calling getpgid for
PID 0, however, it would require an additional syscall and it is inherent
@@ -81,5 +107,25 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
# error "The kernel ABI does not provide a way to implement wait4"
#endif
}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__wait4_time64)
+
+pid_t
+__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
+{
+ pid_t ret ;
+ struct __rusage64 usage64;
+
+ ret = __wait4_time64 (pid, stat_loc, options, &usage64);
+
+ if (ret != 0)
+ return ret;
+
+ rusage64_to_rusage (&usage64, usage);
+
+ return ret;
+}
+#endif
libc_hidden_def (__wait4);
weak_alias (__wait4, wait4)
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage
2020-03-03 18:01 ` [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage Alistair Francis
@ 2020-03-27 18:31 ` Adhemerval Zanella
2020-03-27 18:42 ` Alistair Francis
2020-04-04 14:52 ` Andreas Schwab
1 sibling, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 18:31 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> The Linux kernel expects rusage to use a 32-bit time_t, even on archs
> with a 64-bit time_t (like RV32). To address this let's convert
> rusage to/from 32-bit and 64-bit to ensure the kernel always gets
> a 32-bit time_t.
>
> While we are converting these functions let's also convert them to be
> the y2038 safe versions. This means there is a *64 function that is
> called by a backwards compatible wrapper.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> ---
> include/sys/resource.h | 11 +++++
> sysdeps/unix/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/getrusage.c | 58 +++++++++++++++++++++++++++
> sysdeps/unix/sysv/linux/tv32-compat.h | 47 ++++++++++++++++++++++
> sysdeps/unix/sysv/linux/wait4.c | 50 ++++++++++++++++++++++-
> 5 files changed, 164 insertions(+), 3 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/getrusage.c
>
> diff --git a/include/sys/resource.h b/include/sys/resource.h
> index 9d604dfe3e..64925f257c 100644
> --- a/include/sys/resource.h
> +++ b/include/sys/resource.h
> @@ -134,5 +134,16 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
> extern int __setrlimit (enum __rlimit_resource __resource,
> const struct rlimit *__rlimits);
> libc_hidden_proto (__setrlimit);
> +
> +#if __TIMESIZE == 64
> +# define __getrusage64 __getrusage
> +# define __wait4_time64 __wait4
> +#else
> +extern int __getrusage64 (enum __rusage_who who, struct __rusage64 *usage);
> +libc_hidden_proto (__getrusage64)
> +extern pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options,
> + struct __rusage64 *usage);
> +libc_hidden_proto (__wait4_time64)
> +#endif
> #endif
> #endif
Ok.
> diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
> index d249049d6e..01c4a0e6b1 100644
> --- a/sysdeps/unix/syscalls.list
> +++ b/sysdeps/unix/syscalls.list
> @@ -29,7 +29,6 @@ getpeername - getpeername i:ibN __getpeername getpeername
> getpid - getpid Ei: __getpid getpid
> getpriority - getpriority i:ii __getpriority getpriority
> getrlimit - getrlimit i:ip __getrlimit getrlimit
> -getrusage - getrusage i:ip __getrusage getrusage
> getsockname - getsockname i:ibN __getsockname getsockname
> getsockopt - getsockopt i:iiiBN getsockopt
> getuid - getuid Ei: __getuid getuid
Ok.
> diff --git a/sysdeps/unix/sysv/linux/getrusage.c b/sysdeps/unix/sysv/linux/getrusage.c
> new file mode 100644
> index 0000000000..a4e382ed53
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/getrusage.c
> @@ -0,0 +1,58 @@
> +/* getrusage -- get the rusage struct. Linux version.
> + Copyright (C) 2020 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 <sys/time.h>
> +#include <sys/resource.h>
> +#include <sys/types.h>
> +#include <sysdep.h>
> +#include <tv32-compat.h>
> +
> +int
> +__getrusage64 (enum __rusage_who who, struct __rusage64 *usage)
> +{
> +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> + return INLINE_SYSCALL_CALL (getrusage, who, usage);
> +#else
> + struct __rusage32 usage32;
> + if (INLINE_SYSCALL_CALL (getrusage, who, &usage32) == -1)
> + return -1;
> +
> + rusage32_to_rusage64 (&usage32, usage);
> + return 0;
> +#endif
> +}
> +
Ok.
> +#if __TIMESIZE != 64
> +libc_hidden_def (__getrusage64)
> +int
> +__getrusage (enum __rusage_who who, struct rusage *usage)
> +{
> + int ret ;
> + struct __rusage64 usage64;
> +
> + ret = __getrusage64 (who, &usage64);
> +
> + if (ret != 0)
> + return ret;
> +
> + rusage64_to_rusage (&usage64, usage);
> +
> + return ret;
> +}
> +#endif
> +weak_alias (__getrusage, getrusage)
Ok.
> diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> index b8791b1db8..1ada1f729c 100644
> --- a/sysdeps/unix/sysv/linux/tv32-compat.h
> +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> @@ -20,6 +20,7 @@
> #define _TV32_COMPAT_H 1
>
> #include <bits/types/time_t.h>
> +#include <sys/resource.h>
>
> /* Structures containing 'struct timeval' with 32-bit time_t. */
> struct __itimerval32
> @@ -28,4 +29,50 @@ struct __itimerval32
> struct __timeval32 it_value;
> };
>
> +struct __rusage32
> +{
> + struct __timeval32 ru_utime; /* user time used */
> + struct __timeval32 ru_stime; /* system time used */
> + long ru_maxrss; /* maximum resident set size */
> + long ru_ixrss; /* integral shared memory size */
> + long ru_idrss; /* integral unshared data size */
> + long ru_isrss; /* integral unshared stack size */
> + long ru_minflt; /* page reclaims */
> + long ru_majflt; /* page faults */
> + long ru_nswap; /* swaps */
> + long ru_inblock; /* block input operations */
> + long ru_oublock; /* block output operations */
> + long ru_msgsnd; /* messages sent */
> + long ru_msgrcv; /* messages received */
> + long ru_nsignals; /* signals received */
> + long ru_nvcsw; /* voluntary context switches */
> + long ru_nivcsw; /* involuntary " */
> +};
> +
> +static inline void
> +rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
> + struct __rusage64 *restrict r64)
> +{
> + /* Make sure the entire output structure is cleared, including
> + padding and reserved fields. */
> + memset (r64, 0, sizeof *r64);
> +
> + r64->ru_utime = valid_timeval32_to_timeval64 (r32->ru_utime);
> + r64->ru_stime = valid_timeval32_to_timeval64 (r32->ru_stime);
> + r64->ru_maxrss = r32->ru_maxrss;
> + r64->ru_ixrss = r32->ru_ixrss;
> + r64->ru_idrss = r32->ru_idrss;
> + r64->ru_isrss = r32->ru_isrss;
> + r64->ru_minflt = r32->ru_minflt;
> + r64->ru_majflt = r32->ru_majflt;
> + r64->ru_nswap = r32->ru_nswap;
> + r64->ru_inblock = r32->ru_inblock;
> + r64->ru_oublock = r32->ru_oublock;
> + r64->ru_msgsnd = r32->ru_msgsnd;
> + r64->ru_msgrcv = r32->ru_msgrcv;
> + r64->ru_nsignals = r32->ru_nsignals;
> + r64->ru_nvcsw = r32->ru_nvcsw;
> + r64->ru_nivcsw = r32->ru_nivcsw;
> +}
> +
> #endif /* tv32-compat.h */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
> index 3a8bed1169..da591da4d4 100644
> --- a/sysdeps/unix/sysv/linux/wait4.c
> +++ b/sysdeps/unix/sysv/linux/wait4.c
> @@ -18,14 +18,30 @@
>
> #include <sys/wait.h>
> #include <sys/resource.h>
> +#include <sys/types.h>
> #include <sysdep-cancel.h>
> +#include <tv32-compat.h>
>
> pid_t
> -__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> +__wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage)
> {
> #ifdef __NR_wait4
> +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage);
> +# else
> + struct __rusage32 usage32;
> + pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
> +
> + if (ret != 0)
> + return ret;
> +
> + if (usage != NULL)
> + rusage32_to_rusage64 (&usage32, usage);
Indentation seems wrong.
> +
> + return ret;
> +# endif
> #elif defined (__ASSUME_WAITID_PID0_P_PGID)
> + struct __rusage32 usage32;
> idtype_t idtype = P_PID;
>
> if (pid < -1)
> @@ -41,7 +57,12 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> options |= WEXITED;
>
> siginfo_t infop;
> +
> +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0)
> +# else
> + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0)
> +# endif
> return -1;
>
> if (stat_loc)
> @@ -70,8 +91,13 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> }
> }
>
> +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 == 0
> + if (usage != NULL)
> + rusage32_to_rusage64 (&usage32, usage);
> +# endif
I think compiler will start to emit an unused variable warning if this
code is being used with an 64 bit architecture that only supports
waitid (which seems to be idea for new generic on Linux).
So I think it should be:
# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0)
return -1;
# else
{
struct __rusage32 usage32;
if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0)
return -1;
if (usage != NULL)
rusage32_to_rusage64 (&usage32, usage);
}
# endif
> +
> return infop.si_pid;
> -# else
> +#else
> /* Linux waitid prior kernel 5.4 does not support waiting for the current
> process. It is possible to emulate wait4 it by calling getpgid for
> PID 0, however, it would require an additional syscall and it is inherent
> @@ -81,5 +107,25 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> # error "The kernel ABI does not provide a way to implement wait4"
> #endif
> }
> +
> +#if __TIMESIZE != 64
> +libc_hidden_def (__wait4_time64)
> +
> +pid_t
> +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> +{
> + pid_t ret ;
> + struct __rusage64 usage64;
> +
> + ret = __wait4_time64 (pid, stat_loc, options, &usage64);
> +
> + if (ret != 0)
> + return ret;
> +
> + rusage64_to_rusage (&usage64, usage);
> +
> + return ret;
> +}
> +#endif
> libc_hidden_def (__wait4);
> weak_alias (__wait4, wait4)
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage
2020-03-27 18:31 ` Adhemerval Zanella
@ 2020-03-27 18:42 ` Alistair Francis
0 siblings, 0 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-27 18:42 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, GNU C Library
On Fri, Mar 27, 2020 at 11:32 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
>
>
> On 03/03/2020 14:53, Alistair Francis wrote:
> > The Linux kernel expects rusage to use a 32-bit time_t, even on archs
> > with a 64-bit time_t (like RV32). To address this let's convert
> > rusage to/from 32-bit and 64-bit to ensure the kernel always gets
> > a 32-bit time_t.
> >
> > While we are converting these functions let's also convert them to be
> > the y2038 safe versions. This means there is a *64 function that is
> > called by a backwards compatible wrapper.
> >
> > Reviewed-by: Lukasz Majewski <lukma@denx.de>
> > ---
> > include/sys/resource.h | 11 +++++
> > sysdeps/unix/syscalls.list | 1 -
> > sysdeps/unix/sysv/linux/getrusage.c | 58 +++++++++++++++++++++++++++
> > sysdeps/unix/sysv/linux/tv32-compat.h | 47 ++++++++++++++++++++++
> > sysdeps/unix/sysv/linux/wait4.c | 50 ++++++++++++++++++++++-
> > 5 files changed, 164 insertions(+), 3 deletions(-)
> > create mode 100644 sysdeps/unix/sysv/linux/getrusage.c
> >
> > diff --git a/include/sys/resource.h b/include/sys/resource.h
> > index 9d604dfe3e..64925f257c 100644
> > --- a/include/sys/resource.h
> > +++ b/include/sys/resource.h
> > @@ -134,5 +134,16 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
> > extern int __setrlimit (enum __rlimit_resource __resource,
> > const struct rlimit *__rlimits);
> > libc_hidden_proto (__setrlimit);
> > +
> > +#if __TIMESIZE == 64
> > +# define __getrusage64 __getrusage
> > +# define __wait4_time64 __wait4
> > +#else
> > +extern int __getrusage64 (enum __rusage_who who, struct __rusage64 *usage);
> > +libc_hidden_proto (__getrusage64)
> > +extern pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options,
> > + struct __rusage64 *usage);
> > +libc_hidden_proto (__wait4_time64)
> > +#endif
> > #endif
> > #endif
>
> Ok.
>
> > diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
> > index d249049d6e..01c4a0e6b1 100644
> > --- a/sysdeps/unix/syscalls.list
> > +++ b/sysdeps/unix/syscalls.list
> > @@ -29,7 +29,6 @@ getpeername - getpeername i:ibN __getpeername getpeername
> > getpid - getpid Ei: __getpid getpid
> > getpriority - getpriority i:ii __getpriority getpriority
> > getrlimit - getrlimit i:ip __getrlimit getrlimit
> > -getrusage - getrusage i:ip __getrusage getrusage
> > getsockname - getsockname i:ibN __getsockname getsockname
> > getsockopt - getsockopt i:iiiBN getsockopt
> > getuid - getuid Ei: __getuid getuid
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/getrusage.c b/sysdeps/unix/sysv/linux/getrusage.c
> > new file mode 100644
> > index 0000000000..a4e382ed53
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/getrusage.c
> > @@ -0,0 +1,58 @@
> > +/* getrusage -- get the rusage struct. Linux version.
> > + Copyright (C) 2020 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 <sys/time.h>
> > +#include <sys/resource.h>
> > +#include <sys/types.h>
> > +#include <sysdep.h>
> > +#include <tv32-compat.h>
> > +
> > +int
> > +__getrusage64 (enum __rusage_who who, struct __rusage64 *usage)
> > +{
> > +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> > + return INLINE_SYSCALL_CALL (getrusage, who, usage);
> > +#else
> > + struct __rusage32 usage32;
> > + if (INLINE_SYSCALL_CALL (getrusage, who, &usage32) == -1)
> > + return -1;
> > +
> > + rusage32_to_rusage64 (&usage32, usage);
> > + return 0;
> > +#endif
> > +}
> > +
>
> Ok.
>
> > +#if __TIMESIZE != 64
> > +libc_hidden_def (__getrusage64)
> > +int
> > +__getrusage (enum __rusage_who who, struct rusage *usage)
> > +{
> > + int ret ;
> > + struct __rusage64 usage64;
> > +
> > + ret = __getrusage64 (who, &usage64);
> > +
> > + if (ret != 0)
> > + return ret;
> > +
> > + rusage64_to_rusage (&usage64, usage);
> > +
> > + return ret;
> > +}
> > +#endif
> > +weak_alias (__getrusage, getrusage)
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> > index b8791b1db8..1ada1f729c 100644
> > --- a/sysdeps/unix/sysv/linux/tv32-compat.h
> > +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> > @@ -20,6 +20,7 @@
> > #define _TV32_COMPAT_H 1
> >
> > #include <bits/types/time_t.h>
> > +#include <sys/resource.h>
> >
> > /* Structures containing 'struct timeval' with 32-bit time_t. */
> > struct __itimerval32
> > @@ -28,4 +29,50 @@ struct __itimerval32
> > struct __timeval32 it_value;
> > };
> >
> > +struct __rusage32
> > +{
> > + struct __timeval32 ru_utime; /* user time used */
> > + struct __timeval32 ru_stime; /* system time used */
> > + long ru_maxrss; /* maximum resident set size */
> > + long ru_ixrss; /* integral shared memory size */
> > + long ru_idrss; /* integral unshared data size */
> > + long ru_isrss; /* integral unshared stack size */
> > + long ru_minflt; /* page reclaims */
> > + long ru_majflt; /* page faults */
> > + long ru_nswap; /* swaps */
> > + long ru_inblock; /* block input operations */
> > + long ru_oublock; /* block output operations */
> > + long ru_msgsnd; /* messages sent */
> > + long ru_msgrcv; /* messages received */
> > + long ru_nsignals; /* signals received */
> > + long ru_nvcsw; /* voluntary context switches */
> > + long ru_nivcsw; /* involuntary " */
> > +};
> > +
> > +static inline void
> > +rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
> > + struct __rusage64 *restrict r64)
> > +{
> > + /* Make sure the entire output structure is cleared, including
> > + padding and reserved fields. */
> > + memset (r64, 0, sizeof *r64);
> > +
> > + r64->ru_utime = valid_timeval32_to_timeval64 (r32->ru_utime);
> > + r64->ru_stime = valid_timeval32_to_timeval64 (r32->ru_stime);
> > + r64->ru_maxrss = r32->ru_maxrss;
> > + r64->ru_ixrss = r32->ru_ixrss;
> > + r64->ru_idrss = r32->ru_idrss;
> > + r64->ru_isrss = r32->ru_isrss;
> > + r64->ru_minflt = r32->ru_minflt;
> > + r64->ru_majflt = r32->ru_majflt;
> > + r64->ru_nswap = r32->ru_nswap;
> > + r64->ru_inblock = r32->ru_inblock;
> > + r64->ru_oublock = r32->ru_oublock;
> > + r64->ru_msgsnd = r32->ru_msgsnd;
> > + r64->ru_msgrcv = r32->ru_msgrcv;
> > + r64->ru_nsignals = r32->ru_nsignals;
> > + r64->ru_nvcsw = r32->ru_nvcsw;
> > + r64->ru_nivcsw = r32->ru_nivcsw;
> > +}
> > +
> > #endif /* tv32-compat.h */
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
> > index 3a8bed1169..da591da4d4 100644
> > --- a/sysdeps/unix/sysv/linux/wait4.c
> > +++ b/sysdeps/unix/sysv/linux/wait4.c
> > @@ -18,14 +18,30 @@
> >
> > #include <sys/wait.h>
> > #include <sys/resource.h>
> > +#include <sys/types.h>
> > #include <sysdep-cancel.h>
> > +#include <tv32-compat.h>
> >
> > pid_t
> > -__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> > +__wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage)
> > {
> > #ifdef __NR_wait4
> > +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> > return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage);
> > +# else
> > + struct __rusage32 usage32;
> > + pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
> > +
> > + if (ret != 0)
> > + return ret;
> > +
> > + if (usage != NULL)
> > + rusage32_to_rusage64 (&usage32, usage);
>
> Indentation seems wrong.
Fixed.
>
> > +
> > + return ret;
> > +# endif
> > #elif defined (__ASSUME_WAITID_PID0_P_PGID)
> > + struct __rusage32 usage32;
> > idtype_t idtype = P_PID;
> >
> > if (pid < -1)
> > @@ -41,7 +57,12 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> > options |= WEXITED;
> >
> > siginfo_t infop;
> > +
> > +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> > if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0)
> > +# else
> > + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0)
> > +# endif
> > return -1;
> >
> > if (stat_loc)
> > @@ -70,8 +91,13 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> > }
> > }
> >
> > +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 == 0
> > + if (usage != NULL)
> > + rusage32_to_rusage64 (&usage32, usage);
> > +# endif
>
> I think compiler will start to emit an unused variable warning if this
> code is being used with an 64 bit architecture that only supports
> waitid (which seems to be idea for new generic on Linux).
>
> So I think it should be:
>
> # if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0)
> return -1;
> # else
> {
> struct __rusage32 usage32;
> if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0)
> return -1;
> if (usage != NULL)
> rusage32_to_rusage64 (&usage32, usage);
> }
> # endif
Good point, I have fixed this.
Alistair
>
> > +
> > return infop.si_pid;
> > -# else
> > +#else
> > /* Linux waitid prior kernel 5.4 does not support waiting for the current
> > process. It is possible to emulate wait4 it by calling getpgid for
> > PID 0, however, it would require an additional syscall and it is inherent
> > @@ -81,5 +107,25 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> > # error "The kernel ABI does not provide a way to implement wait4"
> > #endif
> > }
> > +
> > +#if __TIMESIZE != 64
> > +libc_hidden_def (__wait4_time64)
> > +
> > +pid_t
> > +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> > +{
> > + pid_t ret ;
> > + struct __rusage64 usage64;
> > +
> > + ret = __wait4_time64 (pid, stat_loc, options, &usage64);
> > +
> > + if (ret != 0)
> > + return ret;
> > +
> > + rusage64_to_rusage (&usage64, usage);
> > +
> > + return ret;
> > +}
> > +#endif
> > libc_hidden_def (__wait4);
> > weak_alias (__wait4, wait4)
> >
>
> Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage
2020-03-03 18:01 ` [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage Alistair Francis
2020-03-27 18:31 ` Adhemerval Zanella
@ 2020-04-04 14:52 ` Andreas Schwab
1 sibling, 0 replies; 42+ messages in thread
From: Andreas Schwab @ 2020-04-04 14:52 UTC (permalink / raw)
To: Alistair Francis; +Cc: libc-alpha, adhemerval.zanella, Lukasz Majewski
On Mär 03 2020, Alistair Francis wrote:
> +#if __TIMESIZE != 64
> +libc_hidden_def (__wait4_time64)
> +
> +pid_t
> +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
> +{
> + pid_t ret ;
> + struct __rusage64 usage64;
> +
> + ret = __wait4_time64 (pid, stat_loc, options, &usage64);
> +
> + if (ret != 0)
> + return ret;
> +
> + rusage64_to_rusage (&usage64, usage);
usage can be NULL.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 2/8] time: Add a timeval with a 32-bit tv_sec and tv_usec
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
2020-03-03 18:01 ` [PATCH v5 6/8] resource: Add a __rusage64 struct Alistair Francis
2020-03-03 18:01 ` [PATCH v5 7/8] linux: Use long time_t for wait4/getrusage Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 17:00 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer Alistair Francis
` (5 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
On y2038 safe 32-bit systems the Linux kernel expects itimerval to
use a 32-bit time_t, even though the other time_t's are 64-bit. To
address this let's add a __timeval32 struct to be used internally.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
include/time.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/include/time.h b/include/time.h
index 7737be1f7d..927b1ed587 100644
--- a/include/time.h
+++ b/include/time.h
@@ -422,6 +422,51 @@ timespec64_to_timeval64 (const struct __timespec64 ts64)
return tv64;
}
+/* A version of 'struct timeval' with 32-bit time_t
+ and suseconds_t. */
+struct __timeval32
+{
+ __int32_t tv_sec; /* Seconds. */
+ __int32_t tv_usec; /* Microseconds. */
+};
+
+/* Conversion functions for converting to/from __timeval32 */
+static inline struct __timeval64
+valid_timeval32_to_timeval64 (const struct __timeval32 tv)
+{
+ return (struct __timeval64) { tv.tv_sec, tv.tv_usec };
+}
+
+static inline struct __timeval32
+valid_timeval64_to_timeval32 (const struct __timeval64 tv64)
+{
+ return (struct __timeval32) { tv64.tv_sec, tv64.tv_usec };
+}
+
+static inline struct timeval
+valid_timeval32_to_timeval (const struct __timeval32 tv)
+{
+ return (struct timeval) { tv.tv_sec, tv.tv_usec };
+}
+
+static inline struct __timeval32
+valid_timeval_to_timeval32 (const struct timeval tv)
+{
+ return (struct __timeval32) { tv.tv_sec, tv.tv_usec };
+}
+
+static inline struct timespec
+valid_timeval32_to_timespec (const struct __timeval32 tv)
+{
+ return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
+}
+
+static inline struct __timeval32
+valid_timespec_to_timeval32 (const struct timespec ts)
+{
+ return (struct __timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
+}
+
/* Check if a value is in the valid nanoseconds range. Return true if
it is, false otherwise. */
static inline bool
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 2/8] time: Add a timeval with a 32-bit tv_sec and tv_usec
2020-03-03 18:01 ` [PATCH v5 2/8] time: Add a timeval with a 32-bit tv_sec and tv_usec Alistair Francis
@ 2020-03-27 17:00 ` Adhemerval Zanella
0 siblings, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 17:00 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> On y2038 safe 32-bit systems the Linux kernel expects itimerval to
> use a 32-bit time_t, even though the other time_t's are 64-bit. To
> address this let's add a __timeval32 struct to be used internally.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/time.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/include/time.h b/include/time.h
> index 7737be1f7d..927b1ed587 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -422,6 +422,51 @@ timespec64_to_timeval64 (const struct __timespec64 ts64)
> return tv64;
> }
>
> +/* A version of 'struct timeval' with 32-bit time_t
> + and suseconds_t. */
> +struct __timeval32
> +{
> + __int32_t tv_sec; /* Seconds. */
> + __int32_t tv_usec; /* Microseconds. */
> +};
Ok.
> +
> +/* Conversion functions for converting to/from __timeval32 */
> +static inline struct __timeval64
> +valid_timeval32_to_timeval64 (const struct __timeval32 tv)
> +{
> + return (struct __timeval64) { tv.tv_sec, tv.tv_usec };
> +}
> +
> +static inline struct __timeval32
> +valid_timeval64_to_timeval32 (const struct __timeval64 tv64)
> +{
> + return (struct __timeval32) { tv64.tv_sec, tv64.tv_usec };
> +}
> +
> +static inline struct timeval
> +valid_timeval32_to_timeval (const struct __timeval32 tv)
> +{
> + return (struct timeval) { tv.tv_sec, tv.tv_usec };
> +}
> +
> +static inline struct __timeval32
> +valid_timeval_to_timeval32 (const struct timeval tv)
> +{
> + return (struct __timeval32) { tv.tv_sec, tv.tv_usec };
> +}
> +
> +static inline struct timespec
> +valid_timeval32_to_timespec (const struct __timeval32 tv)
> +{
> + return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
> +}
> +
> +static inline struct __timeval32
> +valid_timespec_to_timeval32 (const struct timespec ts)
> +{
> + return (struct __timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
> +}
> +
> /* Check if a value is in the valid nanoseconds range. Return true if
> it is, false otherwise. */
> static inline bool
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (2 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 2/8] time: Add a timeval with a 32-bit tv_sec and tv_usec Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 18:09 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific Alistair Francis
` (4 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
The Linux kernel expects itimerval to use a 32-bit time_t, even on archs
with a 64-bit time_t (like RV32). To address this let's convert
itimerval to/from 32-bit and 64-bit to ensure the kernel always gets
a 32-bit time_t.
While we are converting these functions let's also convert them to be
the y2038 safe versions. This means there is a *64 function that is
called by a backwards compatible wrapper.
Tested-by: Lukasz Majewski <lukma@denx.de>
---
include/time.h | 15 +++++
sysdeps/unix/syscalls.list | 2 -
sysdeps/unix/sysv/linux/getitimer.c | 59 +++++++++++++++++
sysdeps/unix/sysv/linux/setitimer.c | 95 +++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/tv32-compat.h | 31 +++++++++
5 files changed, 200 insertions(+), 2 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/getitimer.c
create mode 100644 sysdeps/unix/sysv/linux/setitimer.c
create mode 100644 sysdeps/unix/sysv/linux/tv32-compat.h
diff --git a/include/time.h b/include/time.h
index e70258e8e3..df3ee55893 100644
--- a/include/time.h
+++ b/include/time.h
@@ -6,6 +6,7 @@
# include <bits/types/locale_t.h>
# include <stdbool.h>
# include <time/mktime-internal.h>
+# include <sys/time.h>
# include <endian.h>
# include <time-clockid.h>
# include <sys/time.h>
@@ -127,6 +128,20 @@ struct __itimerval64
};
#endif
+#if __TIMESIZE == 64
+# define __getitimer64 __getitimer
+# define __setitimer64 __setitimer
+#else
+extern int __getitimer64 (enum __itimer_which __which,
+ struct __itimerval64 *__value);
+
+libc_hidden_proto (__getitimer64)
+extern int __setitimer64 (enum __itimer_which __which,
+ const struct __itimerval64 *__restrict __new,
+ struct __itimerval64 *__restrict __old);
+libc_hidden_proto (__setitimer64)
+#endif
+
#if __TIMESIZE == 64
# define __ctime64 ctime
#else
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index e28e801c7a..d249049d6e 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -25,7 +25,6 @@ getgid - getgid Ei: __getgid getgid
getgroups - getgroups i:ip __getgroups getgroups
gethostid - gethostid i: gethostid
gethostname - gethostname i:bn __gethostname gethostname
-getitimer - getitimer i:ip __getitimer getitimer
getpeername - getpeername i:ibN __getpeername getpeername
getpid - getpid Ei: __getpid getpid
getpriority - getpriority i:ii __getpriority getpriority
@@ -67,7 +66,6 @@ setgid - setgid i:i __setgid setgid
setgroups - setgroups i:ip setgroups
sethostid - sethostid i:i sethostid
sethostname - sethostname i:pi sethostname
-setitimer - setitimer i:ipp __setitimer setitimer
setpgid - setpgrp i:ii __setpgid setpgid
setpriority - setpriority i:iii __setpriority setpriority
setregid - setregid i:ii __setregid setregid
diff --git a/sysdeps/unix/sysv/linux/getitimer.c b/sysdeps/unix/sysv/linux/getitimer.c
new file mode 100644
index 0000000000..12f7963949
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/getitimer.c
@@ -0,0 +1,59 @@
+/* getitimer -- Get the state of an interval timer. Linux/tv32 version.
+ Copyright (C) 2020 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 <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sysdep.h>
+#include <tv32-compat.h>
+
+int
+__getitimer64 (__itimer_which_t which, struct __itimerval64 *curr_value)
+{
+#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+ return INLINE_SYSCALL_CALL (getitimer, which, curr_value);
+#else
+ struct __itimerval32 curr_value_32;
+ if (INLINE_SYSCALL_CALL (getitimer, which, &curr_value_32) == -1)
+ return -1;
+
+ /* Write all fields of 'curr_value' regardless of overflow. */
+ curr_value->it_interval
+ = valid_timeval32_to_timeval64 (curr_value_32.it_interval);
+ curr_value->it_value
+ = valid_timeval32_to_timeval64 (curr_value_32.it_value);
+ return 0;
+#endif
+}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__getitimer64)
+int
+__getitimer (__itimer_which_t which, struct itimerval *curr_value)
+{
+ struct __itimerval64 val64;
+
+ val64.it_interval
+ = valid_timeval_to_timeval64 (curr_value->it_interval);
+ val64.it_value
+ = valid_timeval_to_timeval64 (curr_value->it_value);
+
+ return __getitimer64 (which, &val64);
+}
+#endif
+weak_alias (__getitimer, getitimer)
diff --git a/sysdeps/unix/sysv/linux/setitimer.c b/sysdeps/unix/sysv/linux/setitimer.c
new file mode 100644
index 0000000000..238853dd33
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/setitimer.c
@@ -0,0 +1,95 @@
+/* setitimer -- Set the state of an interval timer. Linux/tv32 version.
+ Copyright (C) 2020 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 <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sysdep.h>
+#include <tv32-compat.h>
+
+int
+__setitimer64 (__itimer_which_t which,
+ const struct __itimerval64 *restrict new_value,
+ struct __itimerval64 *restrict old_value)
+{
+#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+ return INLINE_SYSCALL_CALL (setitimer, which, new_value, old_value);
+#else
+ struct __itimerval32 new_value_32;
+
+ if (! in_time_t_range (new_value->it_interval.tv_sec))
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+ new_value_32.it_interval
+ = valid_timeval64_to_timeval32 (new_value->it_interval);
+
+ if (! in_time_t_range (new_value->it_value.tv_sec))
+ {
+ __set_errno (EOVERFLOW);
+ return -1;
+ }
+ new_value_32.it_value
+ = valid_timeval64_to_timeval32 (new_value->it_value);
+
+ if (old_value == NULL)
+ return INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, NULL);
+
+ struct __itimerval32 old_value_32;
+ if (INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, &old_value_32) == -1)
+ return -1;
+
+ /* Write all fields of 'old_value' regardless of overflow. */
+ old_value->it_interval
+ = valid_timeval32_to_timeval64 (old_value_32.it_interval);
+ old_value->it_value
+ = valid_timeval32_to_timeval64 (old_value_32.it_value);
+ return 0;
+#endif
+}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__setitimer64)
+int
+__setitimer (__itimer_which_t which,
+ const struct itimerval *restrict new_value,
+ struct itimerval *restrict old_value)
+{
+ int ret;
+ struct __itimerval64 new64, old64;
+
+ new64.it_interval
+ = valid_timeval_to_timeval64 (new_value->it_interval);
+ new64.it_value
+ = valid_timeval_to_timeval64 (new_value->it_value);
+
+ ret = __setitimer64 (which, &new64, old_value ? &old64 : NULL);
+
+ if (ret == 0 && old_value)
+ {
+ old_value->it_interval
+ = valid_timeval64_to_timeval (old64.it_interval);
+ old_value->it_value
+ = valid_timeval64_to_timeval (old64.it_value);
+ }
+
+ return ret;
+}
+#endif
+weak_alias (__setitimer, setitimer)
diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
new file mode 100644
index 0000000000..b8791b1db8
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tv32-compat.h
@@ -0,0 +1,31 @@
+/* Compatibility definitions for `struct timeval' with 32-bit time_t.
+ Copyright (C) 2020 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/>. */
+
+#ifndef _TV32_COMPAT_H
+#define _TV32_COMPAT_H 1
+
+#include <bits/types/time_t.h>
+
+/* Structures containing 'struct timeval' with 32-bit time_t. */
+struct __itimerval32
+{
+ struct __timeval32 it_interval;
+ struct __timeval32 it_value;
+};
+
+#endif /* tv32-compat.h */
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer
2020-03-03 18:01 ` [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer Alistair Francis
@ 2020-03-27 18:09 ` Adhemerval Zanella
2020-03-27 18:21 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 18:09 UTC (permalink / raw)
To: Alistair Francis, libc-alpha; +Cc: Lukasz Majewski, Rich Felker
On 03/03/2020 14:53, Alistair Francis wrote:
> The Linux kernel expects itimerval to use a 32-bit time_t, even on archs
> with a 64-bit time_t (like RV32). To address this let's convert
> itimerval to/from 32-bit and 64-bit to ensure the kernel always gets
> a 32-bit time_t.
>
> While we are converting these functions let's also convert them to be
> the y2038 safe versions. This means there is a *64 function that is
> called by a backwards compatible wrapper.
>
> Tested-by: Lukasz Majewski <lukma@denx.de>
Ok, with some nits below.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/time.h | 15 +++++
> sysdeps/unix/syscalls.list | 2 -
> sysdeps/unix/sysv/linux/getitimer.c | 59 +++++++++++++++++
> sysdeps/unix/sysv/linux/setitimer.c | 95 +++++++++++++++++++++++++++
> sysdeps/unix/sysv/linux/tv32-compat.h | 31 +++++++++
> 5 files changed, 200 insertions(+), 2 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/getitimer.c
> create mode 100644 sysdeps/unix/sysv/linux/setitimer.c
> create mode 100644 sysdeps/unix/sysv/linux/tv32-compat.h
>
> diff --git a/include/time.h b/include/time.h
> index e70258e8e3..df3ee55893 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -6,6 +6,7 @@
> # include <bits/types/locale_t.h>
> # include <stdbool.h>
> # include <time/mktime-internal.h>
> +# include <sys/time.h>
> # include <endian.h>
> # include <time-clockid.h>
> # include <sys/time.h>
> @@ -127,6 +128,20 @@ struct __itimerval64
> };
> #endif
>
> +#if __TIMESIZE == 64
> +# define __getitimer64 __getitimer
> +# define __setitimer64 __setitimer
> +#else
> +extern int __getitimer64 (enum __itimer_which __which,
> + struct __itimerval64 *__value);
> +
> +libc_hidden_proto (__getitimer64)
> +extern int __setitimer64 (enum __itimer_which __which,
> + const struct __itimerval64 *__restrict __new,
> + struct __itimerval64 *__restrict __old);
> +libc_hidden_proto (__setitimer64)
> +#endif
> +
> #if __TIMESIZE == 64
> # define __ctime64 ctime
> #else
Ok.
> diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
> index e28e801c7a..d249049d6e 100644
> --- a/sysdeps/unix/syscalls.list
> +++ b/sysdeps/unix/syscalls.list
> @@ -25,7 +25,6 @@ getgid - getgid Ei: __getgid getgid
> getgroups - getgroups i:ip __getgroups getgroups
> gethostid - gethostid i: gethostid
> gethostname - gethostname i:bn __gethostname gethostname
> -getitimer - getitimer i:ip __getitimer getitimer
> getpeername - getpeername i:ibN __getpeername getpeername
> getpid - getpid Ei: __getpid getpid
> getpriority - getpriority i:ii __getpriority getpriority
> @@ -67,7 +66,6 @@ setgid - setgid i:i __setgid setgid
> setgroups - setgroups i:ip setgroups
> sethostid - sethostid i:i sethostid
> sethostname - sethostname i:pi sethostname
> -setitimer - setitimer i:ipp __setitimer setitimer
> setpgid - setpgrp i:ii __setpgid setpgid
> setpriority - setpriority i:iii __setpriority setpriority
> setregid - setregid i:ii __setregid setregid
Ok.
> diff --git a/sysdeps/unix/sysv/linux/getitimer.c b/sysdeps/unix/sysv/linux/getitimer.c
> new file mode 100644
> index 0000000000..12f7963949
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/getitimer.c
> @@ -0,0 +1,59 @@
> +/* getitimer -- Get the state of an interval timer. Linux/tv32 version.
I think tv32 is misleading, since it does handle 64 bit time_t when
kernel supports it.
> + Copyright (C) 2020 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 <time.h>
> +#include <sys/time.h>
> +#include <sys/types.h>
> +#include <sysdep.h>
> +#include <tv32-compat.h>
> +
> +int
> +__getitimer64 (__itimer_which_t which, struct __itimerval64 *curr_value)
> +{
> +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> + return INLINE_SYSCALL_CALL (getitimer, which, curr_value);
> +#else
> + struct __itimerval32 curr_value_32;
> + if (INLINE_SYSCALL_CALL (getitimer, which, &curr_value_32) == -1)
> + return -1;
> +
> + /* Write all fields of 'curr_value' regardless of overflow. */
> + curr_value->it_interval
> + = valid_timeval32_to_timeval64 (curr_value_32.it_interval);
> + curr_value->it_value
> + = valid_timeval32_to_timeval64 (curr_value_32.it_value);
> + return 0;
> +#endif
> +}
Ok.
> +
> +#if __TIMESIZE != 64
> +libc_hidden_def (__getitimer64)
> +int
> +__getitimer (__itimer_which_t which, struct itimerval *curr_value)
> +{
> + struct __itimerval64 val64;
> +
> + val64.it_interval
> + = valid_timeval_to_timeval64 (curr_value->it_interval);
> + val64.it_value
> + = valid_timeval_to_timeval64 (curr_value->it_value);
> +
> + return __getitimer64 (which, &val64);
> +}
> +#endif
> +weak_alias (__getitimer, getitimer)
Ok.
> diff --git a/sysdeps/unix/sysv/linux/setitimer.c b/sysdeps/unix/sysv/linux/setitimer.c
> new file mode 100644
> index 0000000000..238853dd33
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/setitimer.c
> @@ -0,0 +1,95 @@
> +/* setitimer -- Set the state of an interval timer. Linux/tv32 version.
Same as before.
> + Copyright (C) 2020 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 <time.h>
> +#include <sys/time.h>
> +#include <sys/types.h>
> +#include <sysdep.h>
> +#include <tv32-compat.h>
> +
> +int
> +__setitimer64 (__itimer_which_t which,
> + const struct __itimerval64 *restrict new_value,
> + struct __itimerval64 *restrict old_value)
> +{
> +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> + return INLINE_SYSCALL_CALL (setitimer, which, new_value, old_value);
Ok.
> +#else
> + struct __itimerval32 new_value_32;
> +
> + if (! in_time_t_range (new_value->it_interval.tv_sec))
> + {
> + __set_errno (EOVERFLOW);
> + return -1;
> + }
> + new_value_32.it_interval
> + = valid_timeval64_to_timeval32 (new_value->it_interval);
> +
> + if (! in_time_t_range (new_value->it_value.tv_sec))
> + {
> + __set_errno (EOVERFLOW);
> + return -1;
> + }
> + new_value_32.it_value
> + = valid_timeval64_to_timeval32 (new_value->it_value);
Ok, although MUSL return ENOSUP in such case. IMHO EOVERFLOW does
make more sense here.
> +
> + if (old_value == NULL)
> + return INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, NULL);
> +
Ok.
> + struct __itimerval32 old_value_32;
> + if (INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, &old_value_32) == -1)
> + return -1;
> +
> + /* Write all fields of 'old_value' regardless of overflow. */
What do you mean by 'overflow' here? The returned kernel value should
be a timeval with 32-bit value and if it is being called by __setitimer
it should not overflow.
> + old_value->it_interval
> + = valid_timeval32_to_timeval64 (old_value_32.it_interval);
> + old_value->it_value
> + = valid_timeval32_to_timeval64 (old_value_32.it_value);
> + return 0;
> +#endif
> +}
> +
Ok.
> +#if __TIMESIZE != 64
> +libc_hidden_def (__setitimer64)
> +int
> +__setitimer (__itimer_which_t which,
> + const struct itimerval *restrict new_value,
> + struct itimerval *restrict old_value)
> +{
> + int ret;
> + struct __itimerval64 new64, old64;
> +
> + new64.it_interval
> + = valid_timeval_to_timeval64 (new_value->it_interval);
> + new64.it_value
> + = valid_timeval_to_timeval64 (new_value->it_value);
> +
> + ret = __setitimer64 (which, &new64, old_value ? &old64 : NULL);
> +
> + if (ret == 0 && old_value)
> + {
> + old_value->it_interval
> + = valid_timeval64_to_timeval (old64.it_interval);
> + old_value->it_value
> + = valid_timeval64_to_timeval (old64.it_value);
> + }
> +
> + return ret;
> +}
> +#endif
> +weak_alias (__setitimer, setitimer)
Ok.
> diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> new file mode 100644
> index 0000000000..b8791b1db8
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> @@ -0,0 +1,31 @@
> +/* Compatibility definitions for `struct timeval' with 32-bit time_t.
Change ` to '.
> + Copyright (C) 2020 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/>. */
> +
> +#ifndef _TV32_COMPAT_H
> +#define _TV32_COMPAT_H 1
> +
> +#include <bits/types/time_t.h>
> +
> +/* Structures containing 'struct timeval' with 32-bit time_t. */
> +struct __itimerval32
> +{
> + struct __timeval32 it_interval;
> + struct __timeval32 it_value;
> +};
> +
> +#endif /* tv32-compat.h */
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer
2020-03-27 18:09 ` Adhemerval Zanella
@ 2020-03-27 18:21 ` Alistair Francis
0 siblings, 0 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-27 18:21 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, GNU C Library, Rich Felker
On Fri, Mar 27, 2020 at 11:09 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
>
>
> On 03/03/2020 14:53, Alistair Francis wrote:
> > The Linux kernel expects itimerval to use a 32-bit time_t, even on archs
> > with a 64-bit time_t (like RV32). To address this let's convert
> > itimerval to/from 32-bit and 64-bit to ensure the kernel always gets
> > a 32-bit time_t.
> >
> > While we are converting these functions let's also convert them to be
> > the y2038 safe versions. This means there is a *64 function that is
> > called by a backwards compatible wrapper.
> >
> > Tested-by: Lukasz Majewski <lukma@denx.de>
>
> Ok, with some nits below.
>
> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Thanks
>
> > ---
> > include/time.h | 15 +++++
> > sysdeps/unix/syscalls.list | 2 -
> > sysdeps/unix/sysv/linux/getitimer.c | 59 +++++++++++++++++
> > sysdeps/unix/sysv/linux/setitimer.c | 95 +++++++++++++++++++++++++++
> > sysdeps/unix/sysv/linux/tv32-compat.h | 31 +++++++++
> > 5 files changed, 200 insertions(+), 2 deletions(-)
> > create mode 100644 sysdeps/unix/sysv/linux/getitimer.c
> > create mode 100644 sysdeps/unix/sysv/linux/setitimer.c
> > create mode 100644 sysdeps/unix/sysv/linux/tv32-compat.h
> >
> > diff --git a/include/time.h b/include/time.h
> > index e70258e8e3..df3ee55893 100644
> > --- a/include/time.h
> > +++ b/include/time.h
> > @@ -6,6 +6,7 @@
> > # include <bits/types/locale_t.h>
> > # include <stdbool.h>
> > # include <time/mktime-internal.h>
> > +# include <sys/time.h>
> > # include <endian.h>
> > # include <time-clockid.h>
> > # include <sys/time.h>
> > @@ -127,6 +128,20 @@ struct __itimerval64
> > };
> > #endif
> >
> > +#if __TIMESIZE == 64
> > +# define __getitimer64 __getitimer
> > +# define __setitimer64 __setitimer
> > +#else
> > +extern int __getitimer64 (enum __itimer_which __which,
> > + struct __itimerval64 *__value);
> > +
> > +libc_hidden_proto (__getitimer64)
> > +extern int __setitimer64 (enum __itimer_which __which,
> > + const struct __itimerval64 *__restrict __new,
> > + struct __itimerval64 *__restrict __old);
> > +libc_hidden_proto (__setitimer64)
> > +#endif
> > +
> > #if __TIMESIZE == 64
> > # define __ctime64 ctime
> > #else
>
> Ok.
>
> > diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
> > index e28e801c7a..d249049d6e 100644
> > --- a/sysdeps/unix/syscalls.list
> > +++ b/sysdeps/unix/syscalls.list
> > @@ -25,7 +25,6 @@ getgid - getgid Ei: __getgid getgid
> > getgroups - getgroups i:ip __getgroups getgroups
> > gethostid - gethostid i: gethostid
> > gethostname - gethostname i:bn __gethostname gethostname
> > -getitimer - getitimer i:ip __getitimer getitimer
> > getpeername - getpeername i:ibN __getpeername getpeername
> > getpid - getpid Ei: __getpid getpid
> > getpriority - getpriority i:ii __getpriority getpriority
> > @@ -67,7 +66,6 @@ setgid - setgid i:i __setgid setgid
> > setgroups - setgroups i:ip setgroups
> > sethostid - sethostid i:i sethostid
> > sethostname - sethostname i:pi sethostname
> > -setitimer - setitimer i:ipp __setitimer setitimer
> > setpgid - setpgrp i:ii __setpgid setpgid
> > setpriority - setpriority i:iii __setpriority setpriority
> > setregid - setregid i:ii __setregid setregid
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/getitimer.c b/sysdeps/unix/sysv/linux/getitimer.c
> > new file mode 100644
> > index 0000000000..12f7963949
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/getitimer.c
> > @@ -0,0 +1,59 @@
> > +/* getitimer -- Get the state of an interval timer. Linux/tv32 version.
>
> I think tv32 is misleading, since it does handle 64 bit time_t when
> kernel supports it.
I changed this to Linux/32 instead
>
> > + Copyright (C) 2020 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 <time.h>
> > +#include <sys/time.h>
> > +#include <sys/types.h>
> > +#include <sysdep.h>
> > +#include <tv32-compat.h>
> > +
> > +int
> > +__getitimer64 (__itimer_which_t which, struct __itimerval64 *curr_value)
> > +{
> > +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> > + return INLINE_SYSCALL_CALL (getitimer, which, curr_value);
> > +#else
> > + struct __itimerval32 curr_value_32;
> > + if (INLINE_SYSCALL_CALL (getitimer, which, &curr_value_32) == -1)
> > + return -1;
> > +
> > + /* Write all fields of 'curr_value' regardless of overflow. */
> > + curr_value->it_interval
> > + = valid_timeval32_to_timeval64 (curr_value_32.it_interval);
> > + curr_value->it_value
> > + = valid_timeval32_to_timeval64 (curr_value_32.it_value);
> > + return 0;
> > +#endif
> > +}
>
> Ok.
>
> > +
> > +#if __TIMESIZE != 64
> > +libc_hidden_def (__getitimer64)
> > +int
> > +__getitimer (__itimer_which_t which, struct itimerval *curr_value)
> > +{
> > + struct __itimerval64 val64;
> > +
> > + val64.it_interval
> > + = valid_timeval_to_timeval64 (curr_value->it_interval);
> > + val64.it_value
> > + = valid_timeval_to_timeval64 (curr_value->it_value);
> > +
> > + return __getitimer64 (which, &val64);
> > +}
> > +#endif
> > +weak_alias (__getitimer, getitimer)
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/setitimer.c b/sysdeps/unix/sysv/linux/setitimer.c
> > new file mode 100644
> > index 0000000000..238853dd33
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/setitimer.c
> > @@ -0,0 +1,95 @@
> > +/* setitimer -- Set the state of an interval timer. Linux/tv32 version.
>
> Same as before.
Linux/32 instead
>
> > + Copyright (C) 2020 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 <time.h>
> > +#include <sys/time.h>
> > +#include <sys/types.h>
> > +#include <sysdep.h>
> > +#include <tv32-compat.h>
> > +
> > +int
> > +__setitimer64 (__itimer_which_t which,
> > + const struct __itimerval64 *restrict new_value,
> > + struct __itimerval64 *restrict old_value)
> > +{
> > +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
> > + return INLINE_SYSCALL_CALL (setitimer, which, new_value, old_value);
>
> Ok.
>
> > +#else
> > + struct __itimerval32 new_value_32;
> > +
> > + if (! in_time_t_range (new_value->it_interval.tv_sec))
> > + {
> > + __set_errno (EOVERFLOW);
> > + return -1;
> > + }
> > + new_value_32.it_interval
> > + = valid_timeval64_to_timeval32 (new_value->it_interval);
> > +
> > + if (! in_time_t_range (new_value->it_value.tv_sec))
> > + {
> > + __set_errno (EOVERFLOW);
> > + return -1;
> > + }
> > + new_value_32.it_value
> > + = valid_timeval64_to_timeval32 (new_value->it_value);
>
> Ok, although MUSL return ENOSUP in such case. IMHO EOVERFLOW does
> make more sense here.
>
> > +
> > + if (old_value == NULL)
> > + return INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, NULL);
> > +
>
> Ok.
>
> > + struct __itimerval32 old_value_32;
> > + if (INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, &old_value_32) == -1)
> > + return -1;
> > +
> > + /* Write all fields of 'old_value' regardless of overflow. */
>
> What do you mean by 'overflow' here? The returned kernel value should
> be a timeval with 32-bit value and if it is being called by __setitimer
> it should not overflow.
I have removed this comment.
>
> > + old_value->it_interval
> > + = valid_timeval32_to_timeval64 (old_value_32.it_interval);
> > + old_value->it_value
> > + = valid_timeval32_to_timeval64 (old_value_32.it_value);
> > + return 0;
> > +#endif
> > +}
> > +
>
> Ok.
>
> > +#if __TIMESIZE != 64
> > +libc_hidden_def (__setitimer64)
> > +int
> > +__setitimer (__itimer_which_t which,
> > + const struct itimerval *restrict new_value,
> > + struct itimerval *restrict old_value)
> > +{
> > + int ret;
> > + struct __itimerval64 new64, old64;
> > +
> > + new64.it_interval
> > + = valid_timeval_to_timeval64 (new_value->it_interval);
> > + new64.it_value
> > + = valid_timeval_to_timeval64 (new_value->it_value);
> > +
> > + ret = __setitimer64 (which, &new64, old_value ? &old64 : NULL);
> > +
> > + if (ret == 0 && old_value)
> > + {
> > + old_value->it_interval
> > + = valid_timeval64_to_timeval (old64.it_interval);
> > + old_value->it_value
> > + = valid_timeval64_to_timeval (old64.it_value);
> > + }
> > +
> > + return ret;
> > +}
> > +#endif
> > +weak_alias (__setitimer, setitimer)
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> > new file mode 100644
> > index 0000000000..b8791b1db8
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> > @@ -0,0 +1,31 @@
> > +/* Compatibility definitions for `struct timeval' with 32-bit time_t.
>
> Change ` to '.
Fixed.
Alistair
>
> > + Copyright (C) 2020 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/>. */
> > +
> > +#ifndef _TV32_COMPAT_H
> > +#define _TV32_COMPAT_H 1
> > +
> > +#include <bits/types/time_t.h>
> > +
> > +/* Structures containing 'struct timeval' with 32-bit time_t. */
> > +struct __itimerval32
> > +{
> > + struct __timeval32 it_interval;
> > + struct __timeval32 it_value;
> > +};
> > +
> > +#endif /* tv32-compat.h */
> >
>
> Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (3 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 5/8] linux: Use long time_t __getitimer/__setitimer Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-05 9:51 ` Lukasz Majewski
2020-03-27 16:46 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 3/8] time: Add a __itimerval64 struct Alistair Francis
` (3 subsequent siblings)
8 siblings, 2 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
These functions are alpha specifc, rename them to be clear.
Let's also rename the header file from tv32-compat.h to
alpha-tv32-compat.h. This is to avoid conflicts with the one we will
introduce later.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
.../alpha/{tv32-compat.h => alpha-tv32-compat.h} | 16 ++++++++--------
sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 10 +++++-----
sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 6 +++---
sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 10 +++++-----
sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c | 4 ++--
sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 6 +++---
sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 4 ++--
9 files changed, 32 insertions(+), 32 deletions(-)
rename sysdeps/unix/sysv/linux/alpha/{tv32-compat.h => alpha-tv32-compat.h} (88%)
diff --git a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
similarity index 88%
rename from sysdeps/unix/sysv/linux/alpha/tv32-compat.h
rename to sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
index 8e34ed1c1b..3073005c65 100644
--- a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
+++ b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
@@ -70,13 +70,13 @@ struct rusage32
overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
static inline struct timeval
-valid_timeval32_to_timeval (const struct timeval32 tv)
+alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
{
return (struct timeval) { tv.tv_sec, tv.tv_usec };
}
static inline struct timeval32
-valid_timeval_to_timeval32 (const struct timeval tv64)
+alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
{
if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
@@ -84,27 +84,27 @@ valid_timeval_to_timeval32 (const struct timeval tv64)
}
static inline struct timespec
-valid_timeval32_to_timespec (const struct timeval32 tv)
+alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
{
return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
}
static inline struct timeval32
-valid_timespec_to_timeval32 (const struct timespec ts)
+alpha_valid_timespec_to_timeval32 (const struct timespec ts)
{
return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
}
static inline void
-rusage64_to_rusage32 (struct rusage32 *restrict r32,
+alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
const struct rusage *restrict r64)
{
/* Make sure the entire output structure is cleared, including
padding and reserved fields. */
memset (r32, 0, sizeof *r32);
- r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime);
- r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime);
+ r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
+ r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
r32->ru_maxrss = r64->ru_maxrss;
r32->ru_ixrss = r64->ru_ixrss;
r32->ru_idrss = r64->ru_idrss;
@@ -121,4 +121,4 @@ rusage64_to_rusage32 (struct rusage32 *restrict r32,
r32->ru_nivcsw = r64->ru_nivcsw;
}
-#endif /* tv32-compat.h */
+#endif /* alpha-tv32-compat.h */
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
index 9825a4734d..f0a1123639 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
@@ -22,7 +22,7 @@
#include <sys/time.h>
#include <sys/timex.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
struct timex32 {
unsigned int modes; /* mode selector */
@@ -57,13 +57,13 @@ int
attribute_compat_text_section
__adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
{
- struct timeval itv64 = valid_timeval32_to_timeval (*itv);
+ struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
struct timeval otv64;
if (__adjtime (&itv64, &otv64) == -1)
return -1;
- *otv = valid_timeval_to_timeval32 (otv64);
+ *otv = alpha_valid_timeval_to_timeval32 (otv64);
return 0;
}
@@ -91,7 +91,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx64.calcnt = tx->calcnt;
tx64.errcnt = tx->errcnt;
tx64.stbcnt = tx->stbcnt;
- tx64.time = valid_timeval32_to_timeval (tx->time);
+ tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
int status = __adjtimex (&tx64);
if (status < 0)
@@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt;
- tx->time = valid_timeval_to_timeval32 (tx64.time);
+ tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
return status;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
index e9de2b287b..204d4ba796 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
@@ -21,7 +21,7 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
int
attribute_compat_text_section
@@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval
- = valid_timeval_to_timeval32 (curr_value_64.it_interval);
+ = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
curr_value->it_value
- = valid_timeval_to_timeval32 (curr_value_64.it_value);
+ = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
index 74c6fb49aa..be81994654 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
@@ -22,7 +22,7 @@
#include <sys/time.h>
#include <sys/resource.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
int
__getrusage_tv32 (int who, struct rusage32 *usage32)
@@ -31,7 +31,7 @@ __getrusage_tv32 (int who, struct rusage32 *usage32)
if (__getrusage (who, &usage64) == -1)
return -1;
- rusage64_to_rusage32 (usage32, &usage64);
+ alpha_rusage64_to_rusage32 (usage32, &usage64);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
index df7f06765b..9ffda2fde3 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <time.h>
#include <sys/time.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
/* Get the current time of day and timezone information putting it
into *TV and *TZ. */
@@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
struct timespec ts;
__clock_gettime (CLOCK_REALTIME, &ts);
- *tv32 = valid_timespec_to_timeval32 (ts);
+ *tv32 = alpha_valid_timespec_to_timeval32 (ts);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
index 7df2d1b71c..726dfc8b0e 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
@@ -21,7 +21,7 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
int
attribute_compat_text_section
@@ -30,9 +30,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
{
struct itimerval new_value_64;
new_value_64.it_interval
- = valid_timeval32_to_timeval (new_value->it_interval);
+ = alpha_valid_timeval32_to_timeval (new_value->it_interval);
new_value_64.it_value
- = valid_timeval32_to_timeval (new_value->it_value);
+ = alpha_valid_timeval32_to_timeval (new_value->it_value);
if (old_value == NULL)
return __setitimer (which, &new_value_64, NULL);
@@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval
- = valid_timeval_to_timeval32 (old_value_64.it_interval);
+ = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
old_value->it_value
- = valid_timeval_to_timeval32 (old_value_64.it_value);
+ = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
index 6e17a95a47..044363e079 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
@@ -23,7 +23,7 @@
#include <sys/time.h>
#include <time.h>
#include <errno.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
/* Set the current time of day and timezone information.
This call is restricted to the super-user. */
@@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
return __settimezone (tz);
}
- struct timespec ts = valid_timeval32_to_timespec (*tv32);
+ struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
return __clock_settime (CLOCK_REALTIME, &ts);
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
index 6c3fad0132..8ad9fb567c 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
@@ -21,15 +21,15 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
#include <sys/time.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
int
attribute_compat_text_section
__utimes_tv32 (const char *filename, const struct timeval32 times32[2])
{
struct timeval times[2];
- times[0] = valid_timeval32_to_timeval (times32[0]);
- times[1] = valid_timeval32_to_timeval (times32[1]);
+ times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
+ times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
return __utimes (filename, times);
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
index 6af8347871..c664e8e93f 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
@@ -23,7 +23,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include <tv32-compat.h>
+#include <alpha-tv32-compat.h>
pid_t
attribute_compat_text_section
@@ -33,7 +33,7 @@ __wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
pid_t child = __wait4 (pid, status, options, &usage64);
if (child >= 0 && usage32 != NULL)
- rusage64_to_rusage32 (usage32, &usage64);
+ alpha_rusage64_to_rusage32 (usage32, &usage64);
return child;
}
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-03 18:01 ` [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific Alistair Francis
@ 2020-03-05 9:51 ` Lukasz Majewski
2020-03-05 21:38 ` Zack Weinberg
2020-03-27 16:46 ` Adhemerval Zanella
1 sibling, 1 reply; 42+ messages in thread
From: Lukasz Majewski @ 2020-03-05 9:51 UTC (permalink / raw)
To: Alistair Francis
Cc: libc-alpha, adhemerval.zanella, Joseph Myers, Zack Weinberg
[-- Attachment #1: Type: text/plain, Size: 12272 bytes --]
Dear All,
> These functions are alpha specifc, rename them to be clear.
>
> Let's also rename the header file from tv32-compat.h to
> alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> introduce later.
>
Are there any more comments for this patch set from Alistair? Is it
eligible for pulling?
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> ---
> .../alpha/{tv32-compat.h => alpha-tv32-compat.h} | 16
> ++++++++-------- sysdeps/unix/sysv/linux/alpha/osf_adjtime.c |
> 10 +++++----- sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 6
> +++--- sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 10 +++++-----
> sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 6 +++---
> sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 4 ++--
> 9 files changed, 32 insertions(+), 32 deletions(-)
> rename sysdeps/unix/sysv/linux/alpha/{tv32-compat.h =>
> alpha-tv32-compat.h} (88%)
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
> b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h similarity index
> 88% rename from sysdeps/unix/sysv/linux/alpha/tv32-compat.h
> rename to sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> index 8e34ed1c1b..3073005c65 100644
> --- a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
> +++ b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> @@ -70,13 +70,13 @@ struct rusage32
> overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
>
> static inline struct timeval
> -valid_timeval32_to_timeval (const struct timeval32 tv)
> +alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
> {
> return (struct timeval) { tv.tv_sec, tv.tv_usec };
> }
>
> static inline struct timeval32
> -valid_timeval_to_timeval32 (const struct timeval tv64)
> +alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
> {
> if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
> return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
> @@ -84,27 +84,27 @@ valid_timeval_to_timeval32 (const struct timeval
> tv64) }
>
> static inline struct timespec
> -valid_timeval32_to_timespec (const struct timeval32 tv)
> +alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
> {
> return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
> }
>
> static inline struct timeval32
> -valid_timespec_to_timeval32 (const struct timespec ts)
> +alpha_valid_timespec_to_timeval32 (const struct timespec ts)
> {
> return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000
> }; }
>
> static inline void
> -rusage64_to_rusage32 (struct rusage32 *restrict r32,
> +alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
> const struct rusage *restrict r64)
> {
> /* Make sure the entire output structure is cleared, including
> padding and reserved fields. */
> memset (r32, 0, sizeof *r32);
>
> - r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime);
> - r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime);
> + r32->ru_utime = alpha_valid_timeval_to_timeval32
> (r64->ru_utime);
> + r32->ru_stime = alpha_valid_timeval_to_timeval32
> (r64->ru_stime); r32->ru_maxrss = r64->ru_maxrss;
> r32->ru_ixrss = r64->ru_ixrss;
> r32->ru_idrss = r64->ru_idrss;
> @@ -121,4 +121,4 @@ rusage64_to_rusage32 (struct rusage32 *restrict
> r32, r32->ru_nivcsw = r64->ru_nivcsw;
> }
>
> -#endif /* tv32-compat.h */
> +#endif /* alpha-tv32-compat.h */
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c index
> 9825a4734d..f0a1123639 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c @@ -22,7 +22,7 @@
>
> #include <sys/time.h>
> #include <sys/timex.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> struct timex32 {
> unsigned int modes; /* mode selector */
> @@ -57,13 +57,13 @@ int
> attribute_compat_text_section
> __adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
> {
> - struct timeval itv64 = valid_timeval32_to_timeval (*itv);
> + struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
> struct timeval otv64;
>
> if (__adjtime (&itv64, &otv64) == -1)
> return -1;
>
> - *otv = valid_timeval_to_timeval32 (otv64);
> + *otv = alpha_valid_timeval_to_timeval32 (otv64);
> return 0;
> }
>
> @@ -91,7 +91,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx64.calcnt = tx->calcnt;
> tx64.errcnt = tx->errcnt;
> tx64.stbcnt = tx->stbcnt;
> - tx64.time = valid_timeval32_to_timeval (tx->time);
> + tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
>
> int status = __adjtimex (&tx64);
> if (status < 0)
> @@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx->calcnt = tx64.calcnt;
> tx->errcnt = tx64.errcnt;
> tx->stbcnt = tx64.stbcnt;
> - tx->time = valid_timeval_to_timeval32 (tx64.time);
> + tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
>
> return status;
> }
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c index
> e9de2b287b..204d4ba796 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c @@ -21,7 +21,7 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
> @@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32
> *curr_value)
> /* Write all fields of 'curr_value' regardless of overflow. */
> curr_value->it_interval
> - = valid_timeval_to_timeval32 (curr_value_64.it_interval);
> + = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
> curr_value->it_value
> - = valid_timeval_to_timeval32 (curr_value_64.it_value);
> + = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
> return 0;
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c index
> 74c6fb49aa..be81994654 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c @@ -22,7 +22,7 @@
>
> #include <sys/time.h>
> #include <sys/resource.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> __getrusage_tv32 (int who, struct rusage32 *usage32)
> @@ -31,7 +31,7 @@ __getrusage_tv32 (int who, struct rusage32 *usage32)
> if (__getrusage (who, &usage64) == -1)
> return -1;
>
> - rusage64_to_rusage32 (usage32, &usage64);
> + alpha_rusage64_to_rusage32 (usage32, &usage64);
> return 0;
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c index
> df7f06765b..9ffda2fde3 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c @@ -23,7 +23,7 @@
> #include <string.h>
> #include <time.h>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> /* Get the current time of day and timezone information putting it
> into *TV and *TZ. */
> @@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict
> tv32, void *restrict tz) struct timespec ts;
> __clock_gettime (CLOCK_REALTIME, &ts);
>
> - *tv32 = valid_timespec_to_timeval32 (ts);
> + *tv32 = alpha_valid_timespec_to_timeval32 (ts);
> return 0;
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c index
> 7df2d1b71c..726dfc8b0e 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c @@ -21,7 +21,7 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
> @@ -30,9 +30,9 @@ __setitimer_tv32 (int which, const struct
> itimerval32 *restrict new_value, {
> struct itimerval new_value_64;
> new_value_64.it_interval
> - = valid_timeval32_to_timeval (new_value->it_interval);
> + = alpha_valid_timeval32_to_timeval (new_value->it_interval);
> new_value_64.it_value
> - = valid_timeval32_to_timeval (new_value->it_value);
> + = alpha_valid_timeval32_to_timeval (new_value->it_value);
>
> if (old_value == NULL)
> return __setitimer (which, &new_value_64, NULL);
> @@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct
> itimerval32 *restrict new_value,
> /* Write all fields of 'old_value' regardless of overflow. */
> old_value->it_interval
> - = valid_timeval_to_timeval32 (old_value_64.it_interval);
> + = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
> old_value->it_value
> - = valid_timeval_to_timeval32 (old_value_64.it_value);
> + = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
> return 0;
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c index
> 6e17a95a47..044363e079 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c @@ -23,7 +23,7 @@
> #include <sys/time.h>
> #include <time.h>
> #include <errno.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> /* Set the current time of day and timezone information.
> This call is restricted to the super-user. */
> @@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
> return __settimezone (tz);
> }
>
> - struct timespec ts = valid_timeval32_to_timespec (*tv32);
> + struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
> return __clock_settime (CLOCK_REALTIME, &ts);
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c index
> 6c3fad0132..8ad9fb567c 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c @@ -21,15 +21,15 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
> __utimes_tv32 (const char *filename, const struct timeval32
> times32[2]) {
> struct timeval times[2];
> - times[0] = valid_timeval32_to_timeval (times32[0]);
> - times[1] = valid_timeval32_to_timeval (times32[1]);
> + times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
> + times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
> return __utimes (filename, times);
> }
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c index
> 6af8347871..c664e8e93f 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c +++
> b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c @@ -23,7 +23,7 @@
> #include <sys/time.h>
> #include <sys/resource.h>
> #include <sys/wait.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> pid_t
> attribute_compat_text_section
> @@ -33,7 +33,7 @@ __wait4_tv32 (pid_t pid, int *status, int options,
> struct rusage32 *usage32) pid_t child = __wait4 (pid, status,
> options, &usage64);
> if (child >= 0 && usage32 != NULL)
> - rusage64_to_rusage32 (usage32, &usage64);
> + alpha_rusage64_to_rusage32 (usage32, &usage64);
> return child;
> }
>
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 --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-05 9:51 ` Lukasz Majewski
@ 2020-03-05 21:38 ` Zack Weinberg
2020-03-09 22:16 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Zack Weinberg @ 2020-03-05 21:38 UTC (permalink / raw)
To: Lukasz Majewski
Cc: Alistair Francis, GNU C Library, Adhemerval Zanella, Joseph Myers
On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de> wrote:
> > These functions are alpha specifc, rename them to be clear.
> >
> > Let's also rename the header file from tv32-compat.h to
> > alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> > introduce later.
>
> Are there any more comments for this patch set from Alistair? Is it
> eligible for pulling?
I don't have time to go over the whole patch set in detail this week,
but I see that it ends up removing alpha-tv32-compat.h by the end of
the series, so the specific concerns I had with earlier iterations
seem to be addressed.
zw
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-05 21:38 ` Zack Weinberg
@ 2020-03-09 22:16 ` Alistair Francis
2020-03-12 18:45 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-09 22:16 UTC (permalink / raw)
To: Zack Weinberg
Cc: Lukasz Majewski, Alistair Francis, GNU C Library,
Adhemerval Zanella, Joseph Myers
On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com> wrote:
>
> On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de> wrote:
> > > These functions are alpha specifc, rename them to be clear.
> > >
> > > Let's also rename the header file from tv32-compat.h to
> > > alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> > > introduce later.
> >
> > Are there any more comments for this patch set from Alistair? Is it
> > eligible for pulling?
>
> I don't have time to go over the whole patch set in detail this week,
> but I see that it ends up removing alpha-tv32-compat.h by the end of
> the series, so the specific concerns I had with earlier iterations
> seem to be addressed.
Ping!
Am I ok to push this series? It's been reviewed and tested by Lukasz
and no one else seems to have any complaints.
Alistair
>
> zw
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-09 22:16 ` Alistair Francis
@ 2020-03-12 18:45 ` Alistair Francis
2020-03-18 19:46 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-12 18:45 UTC (permalink / raw)
To: Zack Weinberg
Cc: Lukasz Majewski, Alistair Francis, GNU C Library,
Adhemerval Zanella, Joseph Myers
On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com> wrote:
> >
> > On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de> wrote:
> > > > These functions are alpha specifc, rename them to be clear.
> > > >
> > > > Let's also rename the header file from tv32-compat.h to
> > > > alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> > > > introduce later.
> > >
> > > Are there any more comments for this patch set from Alistair? Is it
> > > eligible for pulling?
> >
> > I don't have time to go over the whole patch set in detail this week,
> > but I see that it ends up removing alpha-tv32-compat.h by the end of
> > the series, so the specific concerns I had with earlier iterations
> > seem to be addressed.
>
> Ping!
>
> Am I ok to push this series? It's been reviewed and tested by Lukasz
> and no one else seems to have any complaints.
I have other patches waiting on this and I'm assuming the ARM and ARC
ports need this as well. Any updates?
Alistair
>
> Alistair
>
> >
> > zw
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-12 18:45 ` Alistair Francis
@ 2020-03-18 19:46 ` Alistair Francis
2020-03-24 7:33 ` Lukasz Majewski
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-18 19:46 UTC (permalink / raw)
To: Zack Weinberg
Cc: Lukasz Majewski, Alistair Francis, GNU C Library,
Adhemerval Zanella, Joseph Myers
On Thu, Mar 12, 2020 at 11:45 AM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis <alistair23@gmail.com> wrote:
> >
> > On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com> wrote:
> > >
> > > On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de> wrote:
> > > > > These functions are alpha specifc, rename them to be clear.
> > > > >
> > > > > Let's also rename the header file from tv32-compat.h to
> > > > > alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> > > > > introduce later.
> > > >
> > > > Are there any more comments for this patch set from Alistair? Is it
> > > > eligible for pulling?
> > >
> > > I don't have time to go over the whole patch set in detail this week,
> > > but I see that it ends up removing alpha-tv32-compat.h by the end of
> > > the series, so the specific concerns I had with earlier iterations
> > > seem to be addressed.
> >
> > Ping!
> >
> > Am I ok to push this series? It's been reviewed and tested by Lukasz
> > and no one else seems to have any complaints.
>
> I have other patches waiting on this and I'm assuming the ARM and ARC
> ports need this as well. Any updates?
Ping^2
Alistair
>
> Alistair
>
> >
> > Alistair
> >
> > >
> > > zw
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-18 19:46 ` Alistair Francis
@ 2020-03-24 7:33 ` Lukasz Majewski
2020-03-24 23:58 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Lukasz Majewski @ 2020-03-24 7:33 UTC (permalink / raw)
To: Alistair Francis
Cc: Zack Weinberg, Alistair Francis, GNU C Library,
Adhemerval Zanella, Joseph Myers
[-- Attachment #1: Type: text/plain, Size: 1864 bytes --]
Dear Community,
> On Thu, Mar 12, 2020 at 11:45 AM Alistair Francis
> <alistair23@gmail.com> wrote:
> >
> > On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis
> > <alistair23@gmail.com> wrote:
> > >
> > > On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com>
> > > wrote:
> > > >
> > > > On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de>
> > > > wrote:
> > > > > > These functions are alpha specifc, rename them to be clear.
> > > > > >
> > > > > > Let's also rename the header file from tv32-compat.h to
> > > > > > alpha-tv32-compat.h. This is to avoid conflicts with the
> > > > > > one we will introduce later.
> > > > >
> > > > > Are there any more comments for this patch set from Alistair?
> > > > > Is it eligible for pulling?
> > > >
> > > > I don't have time to go over the whole patch set in detail this
> > > > week, but I see that it ends up removing alpha-tv32-compat.h by
> > > > the end of the series, so the specific concerns I had with
> > > > earlier iterations seem to be addressed.
> > >
> > > Ping!
> > >
> > > Am I ok to push this series? It's been reviewed and tested by
> > > Lukasz and no one else seems to have any complaints.
> >
> > I have other patches waiting on this and I'm assuming the ARM and
> > ARC ports need this as well. Any updates?
>
> Ping^2
Dear community - would it be OK to pull this patch series?
This patch series is ready for submission for more than two weeks now.
>
> Alistair
>
> >
> > Alistair
> >
> > >
> > > Alistair
> > >
> > > >
> > > > zw
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 --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-24 7:33 ` Lukasz Majewski
@ 2020-03-24 23:58 ` Alistair Francis
2020-03-27 16:15 ` Adhemerval Zanella
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-24 23:58 UTC (permalink / raw)
To: Lukasz Majewski
Cc: Zack Weinberg, Alistair Francis, GNU C Library,
Adhemerval Zanella, Joseph Myers
On Tue, Mar 24, 2020 at 12:33 AM Lukasz Majewski <lukma@denx.de> wrote:
>
> Dear Community,
>
> > On Thu, Mar 12, 2020 at 11:45 AM Alistair Francis
> > <alistair23@gmail.com> wrote:
> > >
> > > On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis
> > > <alistair23@gmail.com> wrote:
> > > >
> > > > On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com>
> > > > wrote:
> > > > >
> > > > > On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de>
> > > > > wrote:
> > > > > > > These functions are alpha specifc, rename them to be clear.
> > > > > > >
> > > > > > > Let's also rename the header file from tv32-compat.h to
> > > > > > > alpha-tv32-compat.h. This is to avoid conflicts with the
> > > > > > > one we will introduce later.
> > > > > >
> > > > > > Are there any more comments for this patch set from Alistair?
> > > > > > Is it eligible for pulling?
> > > > >
> > > > > I don't have time to go over the whole patch set in detail this
> > > > > week, but I see that it ends up removing alpha-tv32-compat.h by
> > > > > the end of the series, so the specific concerns I had with
> > > > > earlier iterations seem to be addressed.
> > > >
> > > > Ping!
> > > >
> > > > Am I ok to push this series? It's been reviewed and tested by
> > > > Lukasz and no one else seems to have any complaints.
> > >
> > > I have other patches waiting on this and I'm assuming the ARM and
> > > ARC ports need this as well. Any updates?
> >
> > Ping^2
>
> Dear community - would it be OK to pull this patch series?
>
> This patch series is ready for submission for more than two weeks now.
It also has been reviewed and tested by Lukasz and has no outstanding comments.
I'll push it at the end of the week unless I hear otherwise.
Alistair
>
> >
> > Alistair
> >
> > >
> > > Alistair
> > >
> > > >
> > > > Alistair
> > > >
> > > > >
> > > > > zw
>
>
>
>
> 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
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-24 23:58 ` Alistair Francis
@ 2020-03-27 16:15 ` Adhemerval Zanella
2020-03-27 16:25 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 16:15 UTC (permalink / raw)
To: Alistair Francis, Lukasz Majewski
Cc: Zack Weinberg, Alistair Francis, GNU C Library, Joseph Myers
On 24/03/2020 20:58, Alistair Francis wrote:
> On Tue, Mar 24, 2020 at 12:33 AM Lukasz Majewski <lukma@denx.de> wrote:
>>
>> Dear Community,
>>
>>> On Thu, Mar 12, 2020 at 11:45 AM Alistair Francis
>>> <alistair23@gmail.com> wrote:
>>>>
>>>> On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis
>>>> <alistair23@gmail.com> wrote:
>>>>>
>>>>> On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com>
>>>>> wrote:
>>>>>>
>>>>>> On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de>
>>>>>> wrote:
>>>>>>>> These functions are alpha specifc, rename them to be clear.
>>>>>>>>
>>>>>>>> Let's also rename the header file from tv32-compat.h to
>>>>>>>> alpha-tv32-compat.h. This is to avoid conflicts with the
>>>>>>>> one we will introduce later.
>>>>>>>
>>>>>>> Are there any more comments for this patch set from Alistair?
>>>>>>> Is it eligible for pulling?
>>>>>>
>>>>>> I don't have time to go over the whole patch set in detail this
>>>>>> week, but I see that it ends up removing alpha-tv32-compat.h by
>>>>>> the end of the series, so the specific concerns I had with
>>>>>> earlier iterations seem to be addressed.
>>>>>
>>>>> Ping!
>>>>>
>>>>> Am I ok to push this series? It's been reviewed and tested by
>>>>> Lukasz and no one else seems to have any complaints.
>>>>
>>>> I have other patches waiting on this and I'm assuming the ARM and
>>>> ARC ports need this as well. Any updates?
>>>
>>> Ping^2
>>
>> Dear community - would it be OK to pull this patch series?
>>
>> This patch series is ready for submission for more than two weeks now.
>
> It also has been reviewed and tested by Lukasz and has no outstanding comments.
>
> I'll push it at the end of the week unless I hear otherwise.
I will review this today.
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-27 16:15 ` Adhemerval Zanella
@ 2020-03-27 16:25 ` Alistair Francis
0 siblings, 0 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-27 16:25 UTC (permalink / raw)
To: Adhemerval Zanella
Cc: Lukasz Majewski, Zack Weinberg, Alistair Francis, GNU C Library,
Joseph Myers
On Fri, Mar 27, 2020 at 9:15 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
>
>
> On 24/03/2020 20:58, Alistair Francis wrote:
> > On Tue, Mar 24, 2020 at 12:33 AM Lukasz Majewski <lukma@denx.de> wrote:
> >>
> >> Dear Community,
> >>
> >>> On Thu, Mar 12, 2020 at 11:45 AM Alistair Francis
> >>> <alistair23@gmail.com> wrote:
> >>>>
> >>>> On Mon, Mar 9, 2020 at 3:16 PM Alistair Francis
> >>>> <alistair23@gmail.com> wrote:
> >>>>>
> >>>>> On Thu, Mar 5, 2020 at 1:38 PM Zack Weinberg <zackw@panix.com>
> >>>>> wrote:
> >>>>>>
> >>>>>> On Thu, Mar 5, 2020 at 4:51 AM Lukasz Majewski <lukma@denx.de>
> >>>>>> wrote:
> >>>>>>>> These functions are alpha specifc, rename them to be clear.
> >>>>>>>>
> >>>>>>>> Let's also rename the header file from tv32-compat.h to
> >>>>>>>> alpha-tv32-compat.h. This is to avoid conflicts with the
> >>>>>>>> one we will introduce later.
> >>>>>>>
> >>>>>>> Are there any more comments for this patch set from Alistair?
> >>>>>>> Is it eligible for pulling?
> >>>>>>
> >>>>>> I don't have time to go over the whole patch set in detail this
> >>>>>> week, but I see that it ends up removing alpha-tv32-compat.h by
> >>>>>> the end of the series, so the specific concerns I had with
> >>>>>> earlier iterations seem to be addressed.
> >>>>>
> >>>>> Ping!
> >>>>>
> >>>>> Am I ok to push this series? It's been reviewed and tested by
> >>>>> Lukasz and no one else seems to have any complaints.
> >>>>
> >>>> I have other patches waiting on this and I'm assuming the ARM and
> >>>> ARC ports need this as well. Any updates?
> >>>
> >>> Ping^2
> >>
> >> Dear community - would it be OK to pull this patch series?
> >>
> >> This patch series is ready for submission for more than two weeks now.
> >
> > It also has been reviewed and tested by Lukasz and has no outstanding comments.
> >
> > I'll push it at the end of the week unless I hear otherwise.
>
> I will review this today.
Thanks!
Alistair
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific
2020-03-03 18:01 ` [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific Alistair Francis
2020-03-05 9:51 ` Lukasz Majewski
@ 2020-03-27 16:46 ` Adhemerval Zanella
1 sibling, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 16:46 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> These functions are alpha specifc, rename them to be clear.
>
> Let's also rename the header file from tv32-compat.h to
> alpha-tv32-compat.h. This is to avoid conflicts with the one we will
> introduce later.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> .../alpha/{tv32-compat.h => alpha-tv32-compat.h} | 16 ++++++++--------
> sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 10 +++++-----
> sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 6 +++---
> sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 10 +++++-----
> sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c | 4 ++--
> sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 6 +++---
> sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 4 ++--
> 9 files changed, 32 insertions(+), 32 deletions(-)
> rename sysdeps/unix/sysv/linux/alpha/{tv32-compat.h => alpha-tv32-compat.h} (88%)
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> similarity index 88%
> rename from sysdeps/unix/sysv/linux/alpha/tv32-compat.h
> rename to sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> index 8e34ed1c1b..3073005c65 100644
> --- a/sysdeps/unix/sysv/linux/alpha/tv32-compat.h
> +++ b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> @@ -70,13 +70,13 @@ struct rusage32
> overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
>
> static inline struct timeval
> -valid_timeval32_to_timeval (const struct timeval32 tv)
> +alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
> {
> return (struct timeval) { tv.tv_sec, tv.tv_usec };
> }
>
> static inline struct timeval32
> -valid_timeval_to_timeval32 (const struct timeval tv64)
> +alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
> {
> if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
> return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
Ok.
> @@ -84,27 +84,27 @@ valid_timeval_to_timeval32 (const struct timeval tv64)
> }
>
> static inline struct timespec
> -valid_timeval32_to_timespec (const struct timeval32 tv)
> +alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
> {
> return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
> }
>
> static inline struct timeval32
> -valid_timespec_to_timeval32 (const struct timespec ts)
> +alpha_valid_timespec_to_timeval32 (const struct timespec ts)
> {
> return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
> }
>
Ok.
> static inline void
> -rusage64_to_rusage32 (struct rusage32 *restrict r32,
> +alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
> const struct rusage *restrict r64)
> {
> /* Make sure the entire output structure is cleared, including
> padding and reserved fields. */
> memset (r32, 0, sizeof *r32);
>
> - r32->ru_utime = valid_timeval_to_timeval32 (r64->ru_utime);
> - r32->ru_stime = valid_timeval_to_timeval32 (r64->ru_stime);
> + r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
> + r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
> r32->ru_maxrss = r64->ru_maxrss;
> r32->ru_ixrss = r64->ru_ixrss;
> r32->ru_idrss = r64->ru_idrss;
> @@ -121,4 +121,4 @@ rusage64_to_rusage32 (struct rusage32 *restrict r32,
> r32->ru_nivcsw = r64->ru_nivcsw;
> }
>
> -#endif /* tv32-compat.h */
> +#endif /* alpha-tv32-compat.h */
Ok, but add a double space prior closing the comment.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> index 9825a4734d..f0a1123639 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> @@ -22,7 +22,7 @@
>
> #include <sys/time.h>
> #include <sys/timex.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> struct timex32 {
> unsigned int modes; /* mode selector */
> @@ -57,13 +57,13 @@ int
> attribute_compat_text_section
> __adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
> {
> - struct timeval itv64 = valid_timeval32_to_timeval (*itv);
> + struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
> struct timeval otv64;
>
> if (__adjtime (&itv64, &otv64) == -1)
> return -1;
>
> - *otv = valid_timeval_to_timeval32 (otv64);
> + *otv = alpha_valid_timeval_to_timeval32 (otv64);
> return 0;
> }
>
Ok.
> @@ -91,7 +91,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx64.calcnt = tx->calcnt;
> tx64.errcnt = tx->errcnt;
> tx64.stbcnt = tx->stbcnt;
> - tx64.time = valid_timeval32_to_timeval (tx->time);
> + tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
>
> int status = __adjtimex (&tx64);
> if (status < 0)
> @@ -116,7 +116,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx->calcnt = tx64.calcnt;
> tx->errcnt = tx64.errcnt;
> tx->stbcnt = tx64.stbcnt;
> - tx->time = valid_timeval_to_timeval32 (tx64.time);
> + tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
>
> return status;
> }
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> index e9de2b287b..204d4ba796 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> @@ -21,7 +21,7 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
Ok.
> @@ -33,9 +33,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
>
> /* Write all fields of 'curr_value' regardless of overflow. */
> curr_value->it_interval
> - = valid_timeval_to_timeval32 (curr_value_64.it_interval);
> + = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
> curr_value->it_value
> - = valid_timeval_to_timeval32 (curr_value_64.it_value);
> + = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> index 74c6fb49aa..be81994654 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> @@ -22,7 +22,7 @@
>
> #include <sys/time.h>
> #include <sys/resource.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> __getrusage_tv32 (int who, struct rusage32 *usage32)
Ok.
> @@ -31,7 +31,7 @@ __getrusage_tv32 (int who, struct rusage32 *usage32)
> if (__getrusage (who, &usage64) == -1)
> return -1;
>
> - rusage64_to_rusage32 (usage32, &usage64);
> + alpha_rusage64_to_rusage32 (usage32, &usage64);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> index df7f06765b..9ffda2fde3 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> @@ -23,7 +23,7 @@
> #include <string.h>
> #include <time.h>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> /* Get the current time of day and timezone information putting it
> into *TV and *TZ. */
Ok.
> @@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
> struct timespec ts;
> __clock_gettime (CLOCK_REALTIME, &ts);
>
> - *tv32 = valid_timespec_to_timeval32 (ts);
> + *tv32 = alpha_valid_timespec_to_timeval32 (ts);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> index 7df2d1b71c..726dfc8b0e 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> @@ -21,7 +21,7 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
Ok.
> @@ -30,9 +30,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
> {
> struct itimerval new_value_64;
> new_value_64.it_interval
> - = valid_timeval32_to_timeval (new_value->it_interval);
> + = alpha_valid_timeval32_to_timeval (new_value->it_interval);
> new_value_64.it_value
> - = valid_timeval32_to_timeval (new_value->it_value);
> + = alpha_valid_timeval32_to_timeval (new_value->it_value);
>
> if (old_value == NULL)
> return __setitimer (which, &new_value_64, NULL);
Ok.
> @@ -43,9 +43,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
>
> /* Write all fields of 'old_value' regardless of overflow. */
> old_value->it_interval
> - = valid_timeval_to_timeval32 (old_value_64.it_interval);
> + = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
> old_value->it_value
> - = valid_timeval_to_timeval32 (old_value_64.it_value);
> + = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> index 6e17a95a47..044363e079 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> @@ -23,7 +23,7 @@
> #include <sys/time.h>
> #include <time.h>
> #include <errno.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> /* Set the current time of day and timezone information.
> This call is restricted to the super-user. */
> @@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
> return __settimezone (tz);
> }
>
> - struct timespec ts = valid_timeval32_to_timespec (*tv32);
> + struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
> return __clock_settime (CLOCK_REALTIME, &ts);
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> index 6c3fad0132..8ad9fb567c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> @@ -21,15 +21,15 @@
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> #include <sys/time.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
> __utimes_tv32 (const char *filename, const struct timeval32 times32[2])
> {
> struct timeval times[2];
> - times[0] = valid_timeval32_to_timeval (times32[0]);
> - times[1] = valid_timeval32_to_timeval (times32[1]);
> + times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
> + times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
> return __utimes (filename, times);
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> index 6af8347871..c664e8e93f 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> @@ -23,7 +23,7 @@
> #include <sys/time.h>
> #include <sys/resource.h>
> #include <sys/wait.h>
> -#include <tv32-compat.h>
> +#include <alpha-tv32-compat.h>
>
> pid_t
> attribute_compat_text_section
> @@ -33,7 +33,7 @@ __wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
> pid_t child = __wait4 (pid, status, options, &usage64);
>
> if (child >= 0 && usage32 != NULL)
> - rusage64_to_rusage32 (usage32, &usage64);
> + alpha_rusage64_to_rusage32 (usage32, &usage64);
> return child;
> }
>
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 3/8] time: Add a __itimerval64 struct
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (4 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 1/8] sysv/linux: Rename alpha functions to be alpha specific Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 17:01 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers Alistair Francis
` (2 subsequent siblings)
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
Add a __itimerval64 which always uses a 64-bit time_t.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
include/time.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/include/time.h b/include/time.h
index 927b1ed587..e70258e8e3 100644
--- a/include/time.h
+++ b/include/time.h
@@ -110,6 +110,7 @@ struct __timeval64
#if __TIMESIZE == 64
# define __utimbuf64 utimbuf
+# define __itimerval64 itimerval
#else
/* The glibc Y2038-proof struct __utimbuf64 structure for file's access
and modification time values. */
@@ -118,6 +119,12 @@ struct __utimbuf64
__time64_t actime; /* Access time. */
__time64_t modtime; /* Modification time. */
};
+/* The glibc's internal representation of the struct itimerval. */
+struct __itimerval64
+{
+ struct __timeval64 it_interval;
+ struct __timeval64 it_value;
+};
#endif
#if __TIMESIZE == 64
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 3/8] time: Add a __itimerval64 struct
2020-03-03 18:01 ` [PATCH v5 3/8] time: Add a __itimerval64 struct Alistair Francis
@ 2020-03-27 17:01 ` Adhemerval Zanella
0 siblings, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 17:01 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> Add a __itimerval64 which always uses a 64-bit time_t.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/time.h | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/include/time.h b/include/time.h
> index 927b1ed587..e70258e8e3 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -110,6 +110,7 @@ struct __timeval64
>
> #if __TIMESIZE == 64
> # define __utimbuf64 utimbuf
> +# define __itimerval64 itimerval
> #else
> /* The glibc Y2038-proof struct __utimbuf64 structure for file's access
> and modification time values. */
> @@ -118,6 +119,12 @@ struct __utimbuf64
> __time64_t actime; /* Access time. */
> __time64_t modtime; /* Modification time. */
> };
> +/* The glibc's internal representation of the struct itimerval. */
> +struct __itimerval64
> +{
> + struct __timeval64 it_interval;
> + struct __timeval64 it_value;
> +};
> #endif
>
> #if __TIMESIZE == 64
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (5 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 3/8] time: Add a __itimerval64 struct Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-04-01 16:57 ` Adhemerval Zanella
2020-03-03 18:01 ` [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 Alistair Francis
2020-04-04 13:58 ` [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Andreas Schwab
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
Now there is a generic __timeval32 and helpers we can use them for Alpha
instead of the Alpha specific ones.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
.../unix/sysv/linux/alpha/alpha-tv32-compat.h | 124 ------------------
sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 15 ++-
sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 9 +-
sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 10 +-
.../unix/sysv/linux/alpha/osf_gettimeofday.c | 6 +-
sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 15 ++-
.../unix/sysv/linux/alpha/osf_settimeofday.c | 6 +-
sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 8 +-
sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 10 +-
sysdeps/unix/sysv/linux/tv32-compat.h | 26 ++++
10 files changed, 67 insertions(+), 162 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
diff --git a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
deleted file mode 100644
index 3073005c65..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Compatibility definitions for `struct timeval' with 32-bit time_t.
- Copyright (C) 2019-2020 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/>. */
-
-#ifndef _TV32_COMPAT_H
-#define _TV32_COMPAT_H 1
-
-#include <features.h>
-
-#include <bits/types.h>
-#include <bits/types/time_t.h>
-#include <bits/types/struct_timeval.h>
-#include <bits/types/struct_timespec.h>
-#include <bits/types/struct_rusage.h>
-
-#include <stdint.h> // for INT32_MAX
-#include <string.h> // for memset
-
-#define TV_USEC_MAX 999999 // 10**6 - 1
-
-/* A version of 'struct timeval' with 32-bit time_t. */
-struct timeval32
-{
- int32_t tv_sec;
- int32_t tv_usec;
-};
-
-/* Structures containing 'struct timeval' with 32-bit time_t. */
-struct itimerval32
-{
- struct timeval32 it_interval;
- struct timeval32 it_value;
-};
-
-struct rusage32
-{
- struct timeval32 ru_utime; /* user time used */
- struct timeval32 ru_stime; /* system time used */
- long ru_maxrss; /* maximum resident set size */
- long ru_ixrss; /* integral shared memory size */
- long ru_idrss; /* integral unshared data size */
- long ru_isrss; /* integral unshared stack size */
- long ru_minflt; /* page reclaims */
- long ru_majflt; /* page faults */
- long ru_nswap; /* swaps */
- long ru_inblock; /* block input operations */
- long ru_oublock; /* block output operations */
- long ru_msgsnd; /* messages sent */
- long ru_msgrcv; /* messages received */
- long ru_nsignals; /* signals received */
- long ru_nvcsw; /* voluntary context switches */
- long ru_nivcsw; /* involuntary " */
-};
-
-/* Conversion functions. If the seconds field of a timeval32 would
- overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
-
-static inline struct timeval
-alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
-{
- return (struct timeval) { tv.tv_sec, tv.tv_usec };
-}
-
-static inline struct timeval32
-alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
-{
- if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
- return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
- return (struct timeval32) { tv64.tv_sec, tv64.tv_usec };
-}
-
-static inline struct timespec
-alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
-{
- return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
-}
-
-static inline struct timeval32
-alpha_valid_timespec_to_timeval32 (const struct timespec ts)
-{
- return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
-}
-
-static inline void
-alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
- const struct rusage *restrict r64)
-{
- /* Make sure the entire output structure is cleared, including
- padding and reserved fields. */
- memset (r32, 0, sizeof *r32);
-
- r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
- r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
- r32->ru_maxrss = r64->ru_maxrss;
- r32->ru_ixrss = r64->ru_ixrss;
- r32->ru_idrss = r64->ru_idrss;
- r32->ru_isrss = r64->ru_isrss;
- r32->ru_minflt = r64->ru_minflt;
- r32->ru_majflt = r64->ru_majflt;
- r32->ru_nswap = r64->ru_nswap;
- r32->ru_inblock = r64->ru_inblock;
- r32->ru_oublock = r64->ru_oublock;
- r32->ru_msgsnd = r64->ru_msgsnd;
- r32->ru_msgrcv = r64->ru_msgrcv;
- r32->ru_nsignals = r64->ru_nsignals;
- r32->ru_nvcsw = r64->ru_nvcsw;
- r32->ru_nivcsw = r64->ru_nivcsw;
-}
-
-#endif /* alpha-tv32-compat.h */
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
index f0a1123639..95d646452e 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
@@ -20,9 +20,10 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
#include <sys/timex.h>
-#include <alpha-tv32-compat.h>
+#include <string.h>
struct timex32 {
unsigned int modes; /* mode selector */
@@ -36,7 +37,7 @@ struct timex32 {
long tolerance; /* clock frequency tolerance (ppm)
* (read only)
*/
- struct timeval32 time; /* (read only) */
+ struct __timeval32 time; /* (read only) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
@@ -55,15 +56,15 @@ struct timex32 {
int
attribute_compat_text_section
-__adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
+__adjtime_tv32 (const struct __timeval32 *itv, struct __timeval32 *otv)
{
- struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
+ struct timeval itv64 = valid_timeval32_to_timeval (*itv);
struct timeval otv64;
if (__adjtime (&itv64, &otv64) == -1)
return -1;
- *otv = alpha_valid_timeval_to_timeval32 (otv64);
+ *otv = valid_timeval_to_timeval32 (otv64);
return 0;
}
@@ -91,7 +92,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx64.calcnt = tx->calcnt;
tx64.errcnt = tx->errcnt;
tx64.stbcnt = tx->stbcnt;
- tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
+ tx64.time = valid_timeval32_to_timeval (tx->time);
int status = __adjtimex (&tx64);
if (status < 0)
@@ -116,7 +117,7 @@ __adjtimex_tv32 (struct timex32 *tx)
tx->calcnt = tx64.calcnt;
tx->errcnt = tx64.errcnt;
tx->stbcnt = tx64.stbcnt;
- tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
+ tx->time = valid_timeval_to_timeval32 (tx64.time);
return status;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
index 204d4ba796..4d25060e96 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
@@ -20,12 +20,13 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
attribute_compat_text_section
-__getitimer_tv32 (int which, struct itimerval32 *curr_value)
+__getitimer_tv32 (int which, struct __itimerval32 *curr_value)
{
struct itimerval curr_value_64;
if (__getitimer (which, &curr_value_64) == -1)
@@ -33,9 +34,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
/* Write all fields of 'curr_value' regardless of overflow. */
curr_value->it_interval
- = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
+ = valid_timeval_to_timeval32 (curr_value_64.it_interval);
curr_value->it_value
- = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
+ = valid_timeval_to_timeval32 (curr_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
index be81994654..95cedb0cf6 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
@@ -22,16 +22,16 @@
#include <sys/time.h>
#include <sys/resource.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
-__getrusage_tv32 (int who, struct rusage32 *usage32)
+__getrusage_tv32 (int who, struct __rusage32 *usage32)
{
- struct rusage usage64;
- if (__getrusage (who, &usage64) == -1)
+ struct rusage usage;
+ if (__getrusage (who, &usage) == -1)
return -1;
- alpha_rusage64_to_rusage32 (usage32, &usage64);
+ rusage64_to_rusage32 (&usage, usage32);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
index 9ffda2fde3..8cf5d303f9 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
@@ -20,17 +20,17 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <string.h>
#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
/* Get the current time of day and timezone information putting it
into *TV and *TZ. */
int
attribute_compat_text_section
-__gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
+__gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz)
{
if (__glibc_unlikely (tz != 0))
memset (tz, 0, sizeof (struct timezone));
@@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
struct timespec ts;
__clock_gettime (CLOCK_REALTIME, &ts);
- *tv32 = alpha_valid_timespec_to_timeval32 (ts);
+ *tv32 = valid_timespec_to_timeval32 (ts);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
index 726dfc8b0e..842ab5f64e 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
@@ -20,19 +20,20 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
int
attribute_compat_text_section
-__setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
- struct itimerval32 *restrict old_value)
+__setitimer_tv32 (int which, const struct __itimerval32 *restrict new_value,
+ struct __itimerval32 *restrict old_value)
{
struct itimerval new_value_64;
new_value_64.it_interval
- = alpha_valid_timeval32_to_timeval (new_value->it_interval);
+ = valid_timeval32_to_timeval (new_value->it_interval);
new_value_64.it_value
- = alpha_valid_timeval32_to_timeval (new_value->it_value);
+ = valid_timeval32_to_timeval (new_value->it_value);
if (old_value == NULL)
return __setitimer (which, &new_value_64, NULL);
@@ -43,9 +44,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
/* Write all fields of 'old_value' regardless of overflow. */
old_value->it_interval
- = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
+ = valid_timeval_to_timeval32 (old_value_64.it_interval);
old_value->it_value
- = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
+ = valid_timeval_to_timeval32 (old_value_64.it_value);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
index 044363e079..5ea0a5afb7 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
@@ -20,16 +20,16 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
#include <time.h>
#include <errno.h>
-#include <alpha-tv32-compat.h>
/* Set the current time of day and timezone information.
This call is restricted to the super-user. */
int
attribute_compat_text_section
-__settimeofday_tv32 (const struct timeval32 *tv32,
+__settimeofday_tv32 (const struct __timeval32 *tv32,
const struct timezone *tz)
{
if (__glibc_unlikely (tz != 0))
@@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
return __settimezone (tz);
}
- struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
+ struct timespec ts = valid_timeval32_to_timespec (*tv32);
return __clock_settime (CLOCK_REALTIME, &ts);
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
index 8ad9fb567c..8afbf12185 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
@@ -20,16 +20,16 @@
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+#include <time.h>
#include <sys/time.h>
-#include <alpha-tv32-compat.h>
int
attribute_compat_text_section
-__utimes_tv32 (const char *filename, const struct timeval32 times32[2])
+__utimes_tv32 (const char *filename, const struct __timeval32 times32[2])
{
struct timeval times[2];
- times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
- times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
+ times[0] = valid_timeval32_to_timeval (times32[0]);
+ times[1] = valid_timeval32_to_timeval (times32[1]);
return __utimes (filename, times);
}
diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
index c664e8e93f..4242d5227f 100644
--- a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
+++ b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
@@ -23,17 +23,17 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include <alpha-tv32-compat.h>
+#include <tv32-compat.h>
pid_t
attribute_compat_text_section
-__wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
+__wait4_tv32 (pid_t pid, int *status, int options, struct __rusage32 *usage32)
{
- struct rusage usage64;
- pid_t child = __wait4 (pid, status, options, &usage64);
+ struct rusage usage;
+ pid_t child = __wait4 (pid, status, options, &usage);
if (child >= 0 && usage32 != NULL)
- alpha_rusage64_to_rusage32 (usage32, &usage64);
+ rusage64_to_rusage32 (&usage, usage32);
return child;
}
diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
index 1ada1f729c..f906f6acf5 100644
--- a/sysdeps/unix/sysv/linux/tv32-compat.h
+++ b/sysdeps/unix/sysv/linux/tv32-compat.h
@@ -75,4 +75,30 @@ rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
r64->ru_nivcsw = r32->ru_nivcsw;
}
+static inline void
+rusage64_to_rusage32 (const struct __rusage64 *restrict r64,
+ struct __rusage32 *restrict r32)
+{
+ /* Make sure the entire output structure is cleared, including
+ padding and reserved fields. */
+ memset (r32, 0, sizeof *r32);
+
+ r32->ru_utime = valid_timeval64_to_timeval32 (r64->ru_utime);
+ r32->ru_stime = valid_timeval64_to_timeval32 (r64->ru_stime);
+ r32->ru_maxrss = r64->ru_maxrss;
+ r32->ru_ixrss = r64->ru_ixrss;
+ r32->ru_idrss = r64->ru_idrss;
+ r32->ru_isrss = r64->ru_isrss;
+ r32->ru_minflt = r64->ru_minflt;
+ r32->ru_majflt = r64->ru_majflt;
+ r32->ru_nswap = r64->ru_nswap;
+ r32->ru_inblock = r64->ru_inblock;
+ r32->ru_oublock = r64->ru_oublock;
+ r32->ru_msgsnd = r64->ru_msgsnd;
+ r32->ru_msgrcv = r64->ru_msgrcv;
+ r32->ru_nsignals = r64->ru_nsignals;
+ r32->ru_nvcsw = r64->ru_nvcsw;
+ r32->ru_nivcsw = r64->ru_nivcsw;
+}
+
#endif /* tv32-compat.h */
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers
2020-03-03 18:01 ` [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers Alistair Francis
@ 2020-04-01 16:57 ` Adhemerval Zanella
2020-04-01 16:54 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-01 16:57 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> Now there is a generic __timeval32 and helpers we can use them for Alpha
> instead of the Alpha specific ones.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> .../unix/sysv/linux/alpha/alpha-tv32-compat.h | 124 ------------------
> sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 15 ++-
> sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 9 +-
> sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 10 +-
> .../unix/sysv/linux/alpha/osf_gettimeofday.c | 6 +-
> sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 15 ++-
> .../unix/sysv/linux/alpha/osf_settimeofday.c | 6 +-
> sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 8 +-
> sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 10 +-
> sysdeps/unix/sysv/linux/tv32-compat.h | 26 ++++
> 10 files changed, 67 insertions(+), 162 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> deleted file mode 100644
> index 3073005c65..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> +++ /dev/null
> @@ -1,124 +0,0 @@
> -/* Compatibility definitions for `struct timeval' with 32-bit time_t.
> - Copyright (C) 2019-2020 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/>. */
> -
> -#ifndef _TV32_COMPAT_H
> -#define _TV32_COMPAT_H 1
> -
> -#include <features.h>
> -
> -#include <bits/types.h>
> -#include <bits/types/time_t.h>
> -#include <bits/types/struct_timeval.h>
> -#include <bits/types/struct_timespec.h>
> -#include <bits/types/struct_rusage.h>
> -
> -#include <stdint.h> // for INT32_MAX
> -#include <string.h> // for memset
> -
> -#define TV_USEC_MAX 999999 // 10**6 - 1
> -
> -/* A version of 'struct timeval' with 32-bit time_t. */
> -struct timeval32
> -{
> - int32_t tv_sec;
> - int32_t tv_usec;
> -};
> -
> -/* Structures containing 'struct timeval' with 32-bit time_t. */
> -struct itimerval32
> -{
> - struct timeval32 it_interval;
> - struct timeval32 it_value;
> -};
> -
> -struct rusage32
> -{
> - struct timeval32 ru_utime; /* user time used */
> - struct timeval32 ru_stime; /* system time used */
> - long ru_maxrss; /* maximum resident set size */
> - long ru_ixrss; /* integral shared memory size */
> - long ru_idrss; /* integral unshared data size */
> - long ru_isrss; /* integral unshared stack size */
> - long ru_minflt; /* page reclaims */
> - long ru_majflt; /* page faults */
> - long ru_nswap; /* swaps */
> - long ru_inblock; /* block input operations */
> - long ru_oublock; /* block output operations */
> - long ru_msgsnd; /* messages sent */
> - long ru_msgrcv; /* messages received */
> - long ru_nsignals; /* signals received */
> - long ru_nvcsw; /* voluntary context switches */
> - long ru_nivcsw; /* involuntary " */
> -};
> -
> -/* Conversion functions. If the seconds field of a timeval32 would
> - overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
> -
> -static inline struct timeval
> -alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
> -{
> - return (struct timeval) { tv.tv_sec, tv.tv_usec };
> -}
> -
> -static inline struct timeval32
> -alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
> -{
> - if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
> - return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
> - return (struct timeval32) { tv64.tv_sec, tv64.tv_usec };
> -}
> -
> -static inline struct timespec
> -alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
> -{
> - return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
> -}
> -
> -static inline struct timeval32
> -alpha_valid_timespec_to_timeval32 (const struct timespec ts)
> -{
> - return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
> -}
> -
> -static inline void
> -alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
> - const struct rusage *restrict r64)
> -{
> - /* Make sure the entire output structure is cleared, including
> - padding and reserved fields. */
> - memset (r32, 0, sizeof *r32);
> -
> - r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
> - r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
> - r32->ru_maxrss = r64->ru_maxrss;
> - r32->ru_ixrss = r64->ru_ixrss;
> - r32->ru_idrss = r64->ru_idrss;
> - r32->ru_isrss = r64->ru_isrss;
> - r32->ru_minflt = r64->ru_minflt;
> - r32->ru_majflt = r64->ru_majflt;
> - r32->ru_nswap = r64->ru_nswap;
> - r32->ru_inblock = r64->ru_inblock;
> - r32->ru_oublock = r64->ru_oublock;
> - r32->ru_msgsnd = r64->ru_msgsnd;
> - r32->ru_msgrcv = r64->ru_msgrcv;
> - r32->ru_nsignals = r64->ru_nsignals;
> - r32->ru_nvcsw = r64->ru_nvcsw;
> - r32->ru_nivcsw = r64->ru_nivcsw;
> -}
> -
> -#endif /* alpha-tv32-compat.h */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> index f0a1123639..95d646452e 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> @@ -20,9 +20,10 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <sys/time.h>
> #include <sys/timex.h>
> -#include <alpha-tv32-compat.h>
> +#include <string.h>
>
> struct timex32 {
> unsigned int modes; /* mode selector */
> @@ -36,7 +37,7 @@ struct timex32 {
> long tolerance; /* clock frequency tolerance (ppm)
> * (read only)
> */
> - struct timeval32 time; /* (read only) */
> + struct __timeval32 time; /* (read only) */
> long tick; /* (modified) usecs between clock ticks */
>
> long ppsfreq; /* pps frequency (scaled ppm) (ro) */
Ok.
> @@ -55,15 +56,15 @@ struct timex32 {
>
> int
> attribute_compat_text_section
> -__adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
> +__adjtime_tv32 (const struct __timeval32 *itv, struct __timeval32 *otv)
> {
> - struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
> + struct timeval itv64 = valid_timeval32_to_timeval (*itv);
> struct timeval otv64;
>
> if (__adjtime (&itv64, &otv64) == -1)
> return -1;
>
> - *otv = alpha_valid_timeval_to_timeval32 (otv64);
> + *otv = valid_timeval_to_timeval32 (otv64);
> return 0;
> }
>
Ok.
> @@ -91,7 +92,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx64.calcnt = tx->calcnt;
> tx64.errcnt = tx->errcnt;
> tx64.stbcnt = tx->stbcnt;
> - tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
> + tx64.time = valid_timeval32_to_timeval (tx->time);
>
> int status = __adjtimex (&tx64);
> if (status < 0)
> @@ -116,7 +117,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> tx->calcnt = tx64.calcnt;
> tx->errcnt = tx64.errcnt;
> tx->stbcnt = tx64.stbcnt;
> - tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
> + tx->time = valid_timeval_to_timeval32 (tx64.time);
>
> return status;
> }
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> index 204d4ba796..4d25060e96 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> @@ -20,12 +20,13 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <sys/time.h>
> -#include <alpha-tv32-compat.h>
> +#include <tv32-compat.h>
>
> int
> attribute_compat_text_section
> -__getitimer_tv32 (int which, struct itimerval32 *curr_value)
> +__getitimer_tv32 (int which, struct __itimerval32 *curr_value)
> {
> struct itimerval curr_value_64;
> if (__getitimer (which, &curr_value_64) == -1)
> @@ -33,9 +34,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
>
> /* Write all fields of 'curr_value' regardless of overflow. */
> curr_value->it_interval
> - = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
> + = valid_timeval_to_timeval32 (curr_value_64.it_interval);
> curr_value->it_value
> - = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
> + = valid_timeval_to_timeval32 (curr_value_64.it_value);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> index be81994654..95cedb0cf6 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> @@ -22,16 +22,16 @@
>
> #include <sys/time.h>
> #include <sys/resource.h>
> -#include <alpha-tv32-compat.h>
> +#include <tv32-compat.h>
>
> int
> -__getrusage_tv32 (int who, struct rusage32 *usage32)
> +__getrusage_tv32 (int who, struct __rusage32 *usage32)
> {
> - struct rusage usage64;
> - if (__getrusage (who, &usage64) == -1)
> + struct rusage usage;
> + if (__getrusage (who, &usage) == -1)
> return -1;
>
> - alpha_rusage64_to_rusage32 (usage32, &usage64);
> + rusage64_to_rusage32 (&usage, usage32);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> index 9ffda2fde3..8cf5d303f9 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> @@ -20,17 +20,17 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <string.h>
> #include <time.h>
> #include <sys/time.h>
> -#include <alpha-tv32-compat.h>
>
> /* Get the current time of day and timezone information putting it
> into *TV and *TZ. */
>
> int
> attribute_compat_text_section
> -__gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
> +__gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz)
> {
> if (__glibc_unlikely (tz != 0))
> memset (tz, 0, sizeof (struct timezone));
> @@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
> struct timespec ts;
> __clock_gettime (CLOCK_REALTIME, &ts);
>
> - *tv32 = alpha_valid_timespec_to_timeval32 (ts);
> + *tv32 = valid_timespec_to_timeval32 (ts);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> index 726dfc8b0e..842ab5f64e 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> @@ -20,19 +20,20 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <sys/time.h>
> -#include <alpha-tv32-compat.h>
> +#include <tv32-compat.h>
>
> int
> attribute_compat_text_section
> -__setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
> - struct itimerval32 *restrict old_value)
> +__setitimer_tv32 (int which, const struct __itimerval32 *restrict new_value,
> + struct __itimerval32 *restrict old_value)
> {
> struct itimerval new_value_64;
> new_value_64.it_interval
> - = alpha_valid_timeval32_to_timeval (new_value->it_interval);
> + = valid_timeval32_to_timeval (new_value->it_interval);
> new_value_64.it_value
> - = alpha_valid_timeval32_to_timeval (new_value->it_value);
> + = valid_timeval32_to_timeval (new_value->it_value);
>
> if (old_value == NULL)
> return __setitimer (which, &new_value_64, NULL);
> @@ -43,9 +44,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
>
> /* Write all fields of 'old_value' regardless of overflow. */
> old_value->it_interval
> - = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
> + = valid_timeval_to_timeval32 (old_value_64.it_interval);
> old_value->it_value
> - = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
> + = valid_timeval_to_timeval32 (old_value_64.it_value);
> return 0;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> index 044363e079..5ea0a5afb7 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> @@ -20,16 +20,16 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <sys/time.h>
> #include <time.h>
> #include <errno.h>
> -#include <alpha-tv32-compat.h>
>
> /* Set the current time of day and timezone information.
> This call is restricted to the super-user. */
> int
> attribute_compat_text_section
> -__settimeofday_tv32 (const struct timeval32 *tv32,
> +__settimeofday_tv32 (const struct __timeval32 *tv32,
> const struct timezone *tz)
> {
> if (__glibc_unlikely (tz != 0))
> @@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
> return __settimezone (tz);
> }
>
> - struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
> + struct timespec ts = valid_timeval32_to_timespec (*tv32);
> return __clock_settime (CLOCK_REALTIME, &ts);
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> index 8ad9fb567c..8afbf12185 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> @@ -20,16 +20,16 @@
>
> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
>
> +#include <time.h>
> #include <sys/time.h>
> -#include <alpha-tv32-compat.h>
>
> int
> attribute_compat_text_section
> -__utimes_tv32 (const char *filename, const struct timeval32 times32[2])
> +__utimes_tv32 (const char *filename, const struct __timeval32 times32[2])
> {
> struct timeval times[2];
> - times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
> - times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
> + times[0] = valid_timeval32_to_timeval (times32[0]);
> + times[1] = valid_timeval32_to_timeval (times32[1]);
> return __utimes (filename, times);
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> index c664e8e93f..4242d5227f 100644
> --- a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> +++ b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> @@ -23,17 +23,17 @@
> #include <sys/time.h>
> #include <sys/resource.h>
> #include <sys/wait.h>
> -#include <alpha-tv32-compat.h>
> +#include <tv32-compat.h>
>
> pid_t
> attribute_compat_text_section
> -__wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
> +__wait4_tv32 (pid_t pid, int *status, int options, struct __rusage32 *usage32)
> {
> - struct rusage usage64;
> - pid_t child = __wait4 (pid, status, options, &usage64);
> + struct rusage usage;
> + pid_t child = __wait4 (pid, status, options, &usage);
>
> if (child >= 0 && usage32 != NULL)
> - alpha_rusage64_to_rusage32 (usage32, &usage64);
> + rusage64_to_rusage32 (&usage, usage32);
> return child;
> }
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> index 1ada1f729c..f906f6acf5 100644
> --- a/sysdeps/unix/sysv/linux/tv32-compat.h
> +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> @@ -75,4 +75,30 @@ rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
> r64->ru_nivcsw = r32->ru_nivcsw;
> }
>
> +static inline void
> +rusage64_to_rusage32 (const struct __rusage64 *restrict r64,
> + struct __rusage32 *restrict r32)
> +{
> + /* Make sure the entire output structure is cleared, including
> + padding and reserved fields. */
> + memset (r32, 0, sizeof *r32);
> +
> + r32->ru_utime = valid_timeval64_to_timeval32 (r64->ru_utime);
> + r32->ru_stime = valid_timeval64_to_timeval32 (r64->ru_stime);
> + r32->ru_maxrss = r64->ru_maxrss;
> + r32->ru_ixrss = r64->ru_ixrss;
> + r32->ru_idrss = r64->ru_idrss;
> + r32->ru_isrss = r64->ru_isrss;
> + r32->ru_minflt = r64->ru_minflt;
> + r32->ru_majflt = r64->ru_majflt;
> + r32->ru_nswap = r64->ru_nswap;
> + r32->ru_inblock = r64->ru_inblock;
> + r32->ru_oublock = r64->ru_oublock;
> + r32->ru_msgsnd = r64->ru_msgsnd;
> + r32->ru_msgrcv = r64->ru_msgrcv;
> + r32->ru_nsignals = r64->ru_nsignals;
> + r32->ru_nvcsw = r64->ru_nvcsw;
> + r32->ru_nivcsw = r64->ru_nivcsw;
> +}
> +
> #endif /* tv32-compat.h */
>
Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers
2020-04-01 16:57 ` Adhemerval Zanella
@ 2020-04-01 16:54 ` Alistair Francis
0 siblings, 0 replies; 42+ messages in thread
From: Alistair Francis @ 2020-04-01 16:54 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, GNU C Library
On Wed, Apr 1, 2020 at 9:57 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
>
>
> On 03/03/2020 14:53, Alistair Francis wrote:
> > Now there is a generic __timeval32 and helpers we can use them for Alpha
> > instead of the Alpha specific ones.
> >
> > Reviewed-by: Lukasz Majewski <lukma@denx.de>
>
> LGTM, thanks.
>
> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Thanks so much for reviewing this. I'll run one last test to make sure
I didn't introduce a typo in the changes then push this.
Alistair
>
> > ---
> > .../unix/sysv/linux/alpha/alpha-tv32-compat.h | 124 ------------------
> > sysdeps/unix/sysv/linux/alpha/osf_adjtime.c | 15 ++-
> > sysdeps/unix/sysv/linux/alpha/osf_getitimer.c | 9 +-
> > sysdeps/unix/sysv/linux/alpha/osf_getrusage.c | 10 +-
> > .../unix/sysv/linux/alpha/osf_gettimeofday.c | 6 +-
> > sysdeps/unix/sysv/linux/alpha/osf_setitimer.c | 15 ++-
> > .../unix/sysv/linux/alpha/osf_settimeofday.c | 6 +-
> > sysdeps/unix/sysv/linux/alpha/osf_utimes.c | 8 +-
> > sysdeps/unix/sysv/linux/alpha/osf_wait4.c | 10 +-
> > sysdeps/unix/sysv/linux/tv32-compat.h | 26 ++++
> > 10 files changed, 67 insertions(+), 162 deletions(-)
> > delete mode 100644 sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> >
> > diff --git a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h b/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> > deleted file mode 100644
> > index 3073005c65..0000000000
> > --- a/sysdeps/unix/sysv/linux/alpha/alpha-tv32-compat.h
> > +++ /dev/null
> > @@ -1,124 +0,0 @@
> > -/* Compatibility definitions for `struct timeval' with 32-bit time_t.
> > - Copyright (C) 2019-2020 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/>. */
> > -
> > -#ifndef _TV32_COMPAT_H
> > -#define _TV32_COMPAT_H 1
> > -
> > -#include <features.h>
> > -
> > -#include <bits/types.h>
> > -#include <bits/types/time_t.h>
> > -#include <bits/types/struct_timeval.h>
> > -#include <bits/types/struct_timespec.h>
> > -#include <bits/types/struct_rusage.h>
> > -
> > -#include <stdint.h> // for INT32_MAX
> > -#include <string.h> // for memset
> > -
> > -#define TV_USEC_MAX 999999 // 10**6 - 1
> > -
> > -/* A version of 'struct timeval' with 32-bit time_t. */
> > -struct timeval32
> > -{
> > - int32_t tv_sec;
> > - int32_t tv_usec;
> > -};
> > -
> > -/* Structures containing 'struct timeval' with 32-bit time_t. */
> > -struct itimerval32
> > -{
> > - struct timeval32 it_interval;
> > - struct timeval32 it_value;
> > -};
> > -
> > -struct rusage32
> > -{
> > - struct timeval32 ru_utime; /* user time used */
> > - struct timeval32 ru_stime; /* system time used */
> > - long ru_maxrss; /* maximum resident set size */
> > - long ru_ixrss; /* integral shared memory size */
> > - long ru_idrss; /* integral unshared data size */
> > - long ru_isrss; /* integral unshared stack size */
> > - long ru_minflt; /* page reclaims */
> > - long ru_majflt; /* page faults */
> > - long ru_nswap; /* swaps */
> > - long ru_inblock; /* block input operations */
> > - long ru_oublock; /* block output operations */
> > - long ru_msgsnd; /* messages sent */
> > - long ru_msgrcv; /* messages received */
> > - long ru_nsignals; /* signals received */
> > - long ru_nvcsw; /* voluntary context switches */
> > - long ru_nivcsw; /* involuntary " */
> > -};
> > -
> > -/* Conversion functions. If the seconds field of a timeval32 would
> > - overflow, they write { INT32_MAX, TV_USEC_MAX } to the output. */
> > -
> > -static inline struct timeval
> > -alpha_valid_timeval32_to_timeval (const struct timeval32 tv)
> > -{
> > - return (struct timeval) { tv.tv_sec, tv.tv_usec };
> > -}
> > -
> > -static inline struct timeval32
> > -alpha_valid_timeval_to_timeval32 (const struct timeval tv64)
> > -{
> > - if (__glibc_unlikely (tv64.tv_sec > (time_t) INT32_MAX))
> > - return (struct timeval32) { INT32_MAX, TV_USEC_MAX};
> > - return (struct timeval32) { tv64.tv_sec, tv64.tv_usec };
> > -}
> > -
> > -static inline struct timespec
> > -alpha_valid_timeval32_to_timespec (const struct timeval32 tv)
> > -{
> > - return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
> > -}
> > -
> > -static inline struct timeval32
> > -alpha_valid_timespec_to_timeval32 (const struct timespec ts)
> > -{
> > - return (struct timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
> > -}
> > -
> > -static inline void
> > -alpha_rusage64_to_rusage32 (struct rusage32 *restrict r32,
> > - const struct rusage *restrict r64)
> > -{
> > - /* Make sure the entire output structure is cleared, including
> > - padding and reserved fields. */
> > - memset (r32, 0, sizeof *r32);
> > -
> > - r32->ru_utime = alpha_valid_timeval_to_timeval32 (r64->ru_utime);
> > - r32->ru_stime = alpha_valid_timeval_to_timeval32 (r64->ru_stime);
> > - r32->ru_maxrss = r64->ru_maxrss;
> > - r32->ru_ixrss = r64->ru_ixrss;
> > - r32->ru_idrss = r64->ru_idrss;
> > - r32->ru_isrss = r64->ru_isrss;
> > - r32->ru_minflt = r64->ru_minflt;
> > - r32->ru_majflt = r64->ru_majflt;
> > - r32->ru_nswap = r64->ru_nswap;
> > - r32->ru_inblock = r64->ru_inblock;
> > - r32->ru_oublock = r64->ru_oublock;
> > - r32->ru_msgsnd = r64->ru_msgsnd;
> > - r32->ru_msgrcv = r64->ru_msgrcv;
> > - r32->ru_nsignals = r64->ru_nsignals;
> > - r32->ru_nvcsw = r64->ru_nvcsw;
> > - r32->ru_nivcsw = r64->ru_nivcsw;
> > -}
> > -
> > -#endif /* alpha-tv32-compat.h */
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> > index f0a1123639..95d646452e 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_adjtime.c
> > @@ -20,9 +20,10 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <sys/time.h>
> > #include <sys/timex.h>
> > -#include <alpha-tv32-compat.h>
> > +#include <string.h>
> >
> > struct timex32 {
> > unsigned int modes; /* mode selector */
> > @@ -36,7 +37,7 @@ struct timex32 {
> > long tolerance; /* clock frequency tolerance (ppm)
> > * (read only)
> > */
> > - struct timeval32 time; /* (read only) */
> > + struct __timeval32 time; /* (read only) */
> > long tick; /* (modified) usecs between clock ticks */
> >
> > long ppsfreq; /* pps frequency (scaled ppm) (ro) */
>
> Ok.
>
> > @@ -55,15 +56,15 @@ struct timex32 {
> >
> > int
> > attribute_compat_text_section
> > -__adjtime_tv32 (const struct timeval32 *itv, struct timeval32 *otv)
> > +__adjtime_tv32 (const struct __timeval32 *itv, struct __timeval32 *otv)
> > {
> > - struct timeval itv64 = alpha_valid_timeval32_to_timeval (*itv);
> > + struct timeval itv64 = valid_timeval32_to_timeval (*itv);
> > struct timeval otv64;
> >
> > if (__adjtime (&itv64, &otv64) == -1)
> > return -1;
> >
> > - *otv = alpha_valid_timeval_to_timeval32 (otv64);
> > + *otv = valid_timeval_to_timeval32 (otv64);
> > return 0;
> > }
> >
>
> Ok.
>
> > @@ -91,7 +92,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> > tx64.calcnt = tx->calcnt;
> > tx64.errcnt = tx->errcnt;
> > tx64.stbcnt = tx->stbcnt;
> > - tx64.time = alpha_valid_timeval32_to_timeval (tx->time);
> > + tx64.time = valid_timeval32_to_timeval (tx->time);
> >
> > int status = __adjtimex (&tx64);
> > if (status < 0)
> > @@ -116,7 +117,7 @@ __adjtimex_tv32 (struct timex32 *tx)
> > tx->calcnt = tx64.calcnt;
> > tx->errcnt = tx64.errcnt;
> > tx->stbcnt = tx64.stbcnt;
> > - tx->time = alpha_valid_timeval_to_timeval32 (tx64.time);
> > + tx->time = valid_timeval_to_timeval32 (tx64.time);
> >
> > return status;
> > }
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> > index 204d4ba796..4d25060e96 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_getitimer.c
> > @@ -20,12 +20,13 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <sys/time.h>
> > -#include <alpha-tv32-compat.h>
> > +#include <tv32-compat.h>
> >
> > int
> > attribute_compat_text_section
> > -__getitimer_tv32 (int which, struct itimerval32 *curr_value)
> > +__getitimer_tv32 (int which, struct __itimerval32 *curr_value)
> > {
> > struct itimerval curr_value_64;
> > if (__getitimer (which, &curr_value_64) == -1)
> > @@ -33,9 +34,9 @@ __getitimer_tv32 (int which, struct itimerval32 *curr_value)
> >
> > /* Write all fields of 'curr_value' regardless of overflow. */
> > curr_value->it_interval
> > - = alpha_valid_timeval_to_timeval32 (curr_value_64.it_interval);
> > + = valid_timeval_to_timeval32 (curr_value_64.it_interval);
> > curr_value->it_value
> > - = alpha_valid_timeval_to_timeval32 (curr_value_64.it_value);
> > + = valid_timeval_to_timeval32 (curr_value_64.it_value);
> > return 0;
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> > index be81994654..95cedb0cf6 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_getrusage.c
> > @@ -22,16 +22,16 @@
> >
> > #include <sys/time.h>
> > #include <sys/resource.h>
> > -#include <alpha-tv32-compat.h>
> > +#include <tv32-compat.h>
> >
> > int
> > -__getrusage_tv32 (int who, struct rusage32 *usage32)
> > +__getrusage_tv32 (int who, struct __rusage32 *usage32)
> > {
> > - struct rusage usage64;
> > - if (__getrusage (who, &usage64) == -1)
> > + struct rusage usage;
> > + if (__getrusage (who, &usage) == -1)
> > return -1;
> >
> > - alpha_rusage64_to_rusage32 (usage32, &usage64);
> > + rusage64_to_rusage32 (&usage, usage32);
> > return 0;
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> > index 9ffda2fde3..8cf5d303f9 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
> > @@ -20,17 +20,17 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <string.h>
> > #include <time.h>
> > #include <sys/time.h>
> > -#include <alpha-tv32-compat.h>
> >
> > /* Get the current time of day and timezone information putting it
> > into *TV and *TZ. */
> >
> > int
> > attribute_compat_text_section
> > -__gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
> > +__gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz)
> > {
> > if (__glibc_unlikely (tz != 0))
> > memset (tz, 0, sizeof (struct timezone));
> > @@ -38,7 +38,7 @@ __gettimeofday_tv32 (struct timeval32 *restrict tv32, void *restrict tz)
> > struct timespec ts;
> > __clock_gettime (CLOCK_REALTIME, &ts);
> >
> > - *tv32 = alpha_valid_timespec_to_timeval32 (ts);
> > + *tv32 = valid_timespec_to_timeval32 (ts);
> > return 0;
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> > index 726dfc8b0e..842ab5f64e 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_setitimer.c
> > @@ -20,19 +20,20 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <sys/time.h>
> > -#include <alpha-tv32-compat.h>
> > +#include <tv32-compat.h>
> >
> > int
> > attribute_compat_text_section
> > -__setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
> > - struct itimerval32 *restrict old_value)
> > +__setitimer_tv32 (int which, const struct __itimerval32 *restrict new_value,
> > + struct __itimerval32 *restrict old_value)
> > {
> > struct itimerval new_value_64;
> > new_value_64.it_interval
> > - = alpha_valid_timeval32_to_timeval (new_value->it_interval);
> > + = valid_timeval32_to_timeval (new_value->it_interval);
> > new_value_64.it_value
> > - = alpha_valid_timeval32_to_timeval (new_value->it_value);
> > + = valid_timeval32_to_timeval (new_value->it_value);
> >
> > if (old_value == NULL)
> > return __setitimer (which, &new_value_64, NULL);
> > @@ -43,9 +44,9 @@ __setitimer_tv32 (int which, const struct itimerval32 *restrict new_value,
> >
> > /* Write all fields of 'old_value' regardless of overflow. */
> > old_value->it_interval
> > - = alpha_valid_timeval_to_timeval32 (old_value_64.it_interval);
> > + = valid_timeval_to_timeval32 (old_value_64.it_interval);
> > old_value->it_value
> > - = alpha_valid_timeval_to_timeval32 (old_value_64.it_value);
> > + = valid_timeval_to_timeval32 (old_value_64.it_value);
> > return 0;
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> > index 044363e079..5ea0a5afb7 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_settimeofday.c
> > @@ -20,16 +20,16 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <sys/time.h>
> > #include <time.h>
> > #include <errno.h>
> > -#include <alpha-tv32-compat.h>
> >
> > /* Set the current time of day and timezone information.
> > This call is restricted to the super-user. */
> > int
> > attribute_compat_text_section
> > -__settimeofday_tv32 (const struct timeval32 *tv32,
> > +__settimeofday_tv32 (const struct __timeval32 *tv32,
> > const struct timezone *tz)
> > {
> > if (__glibc_unlikely (tz != 0))
> > @@ -42,7 +42,7 @@ __settimeofday_tv32 (const struct timeval32 *tv32,
> > return __settimezone (tz);
> > }
> >
> > - struct timespec ts = alpha_valid_timeval32_to_timespec (*tv32);
> > + struct timespec ts = valid_timeval32_to_timespec (*tv32);
> > return __clock_settime (CLOCK_REALTIME, &ts);
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> > index 8ad9fb567c..8afbf12185 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_utimes.c
> > @@ -20,16 +20,16 @@
> >
> > #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
> >
> > +#include <time.h>
> > #include <sys/time.h>
> > -#include <alpha-tv32-compat.h>
> >
> > int
> > attribute_compat_text_section
> > -__utimes_tv32 (const char *filename, const struct timeval32 times32[2])
> > +__utimes_tv32 (const char *filename, const struct __timeval32 times32[2])
> > {
> > struct timeval times[2];
> > - times[0] = alpha_valid_timeval32_to_timeval (times32[0]);
> > - times[1] = alpha_valid_timeval32_to_timeval (times32[1]);
> > + times[0] = valid_timeval32_to_timeval (times32[0]);
> > + times[1] = valid_timeval32_to_timeval (times32[1]);
> > return __utimes (filename, times);
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> > index c664e8e93f..4242d5227f 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> > +++ b/sysdeps/unix/sysv/linux/alpha/osf_wait4.c
> > @@ -23,17 +23,17 @@
> > #include <sys/time.h>
> > #include <sys/resource.h>
> > #include <sys/wait.h>
> > -#include <alpha-tv32-compat.h>
> > +#include <tv32-compat.h>
> >
> > pid_t
> > attribute_compat_text_section
> > -__wait4_tv32 (pid_t pid, int *status, int options, struct rusage32 *usage32)
> > +__wait4_tv32 (pid_t pid, int *status, int options, struct __rusage32 *usage32)
> > {
> > - struct rusage usage64;
> > - pid_t child = __wait4 (pid, status, options, &usage64);
> > + struct rusage usage;
> > + pid_t child = __wait4 (pid, status, options, &usage);
> >
> > if (child >= 0 && usage32 != NULL)
> > - alpha_rusage64_to_rusage32 (usage32, &usage64);
> > + rusage64_to_rusage32 (&usage, usage32);
> > return child;
> > }
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h
> > index 1ada1f729c..f906f6acf5 100644
> > --- a/sysdeps/unix/sysv/linux/tv32-compat.h
> > +++ b/sysdeps/unix/sysv/linux/tv32-compat.h
> > @@ -75,4 +75,30 @@ rusage32_to_rusage64 (const struct __rusage32 *restrict r32,
> > r64->ru_nivcsw = r32->ru_nivcsw;
> > }
> >
> > +static inline void
> > +rusage64_to_rusage32 (const struct __rusage64 *restrict r64,
> > + struct __rusage32 *restrict r32)
> > +{
> > + /* Make sure the entire output structure is cleared, including
> > + padding and reserved fields. */
> > + memset (r32, 0, sizeof *r32);
> > +
> > + r32->ru_utime = valid_timeval64_to_timeval32 (r64->ru_utime);
> > + r32->ru_stime = valid_timeval64_to_timeval32 (r64->ru_stime);
> > + r32->ru_maxrss = r64->ru_maxrss;
> > + r32->ru_ixrss = r64->ru_ixrss;
> > + r32->ru_idrss = r64->ru_idrss;
> > + r32->ru_isrss = r64->ru_isrss;
> > + r32->ru_minflt = r64->ru_minflt;
> > + r32->ru_majflt = r64->ru_majflt;
> > + r32->ru_nswap = r64->ru_nswap;
> > + r32->ru_inblock = r64->ru_inblock;
> > + r32->ru_oublock = r64->ru_oublock;
> > + r32->ru_msgsnd = r64->ru_msgsnd;
> > + r32->ru_msgrcv = r64->ru_msgrcv;
> > + r32->ru_nsignals = r64->ru_nsignals;
> > + r32->ru_nvcsw = r64->ru_nvcsw;
> > + r32->ru_nivcsw = r64->ru_nivcsw;
> > +}
> > +
> > #endif /* tv32-compat.h */
> >
>
> Ok.
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (6 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 8/8] sysv/alpha: Use generic __timeval32 and helpers Alistair Francis
@ 2020-03-03 18:01 ` Alistair Francis
2020-03-27 17:58 ` Adhemerval Zanella
2020-04-04 13:58 ` [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Andreas Schwab
8 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-03-03 18:01 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Alistair Francis, Lukasz Majewski
On y2038 safe 32-bit systems the Linux kernel expects itimerval
and rusage to use a 32-bit time_t, even though the other time_t's
are 64-bit.
There are also other occurances where the time passed to the kernel via
timeval doesn't match the wordsize.
To handle these cases let's define a new macro
__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64. This macro specifies if the
kernel's old_timeval matches the new timeval64. This should be true for
64-bit architectures (expect for Alpha) and x32.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
bits/typesizes.h | 6 ++++++
sysdeps/unix/sysv/linux/alpha/bits/typesizes.h | 3 +++
sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 6 ++++++
sysdeps/unix/sysv/linux/s390/bits/typesizes.h | 6 ++++++
sysdeps/unix/sysv/linux/sparc/bits/typesizes.h | 6 ++++++
sysdeps/unix/sysv/linux/x86/bits/typesizes.h | 3 +++
6 files changed, 30 insertions(+)
diff --git a/bits/typesizes.h b/bits/typesizes.h
index 599408973e..8f16903a21 100644
--- a/bits/typesizes.h
+++ b/bits/typesizes.h
@@ -76,10 +76,16 @@
/* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
# define __STATFS_MATCHES_STATFS64 1
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
#else
# define __RLIM_T_MATCHES_RLIM64_T 0
# define __STATFS_MATCHES_STATFS64 0
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
#endif
/* Number of descriptors that can fit in an `fd_set'. */
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
index 28ee3e5920..e5d7774468 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
@@ -73,6 +73,9 @@
/* Not for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
# define __STATFS_MATCHES_STATFS64 0
+/* And for getitimer, setitimer and rusage */
+#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
index 7c963e523e..4fb246ac74 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
@@ -77,11 +77,17 @@
/* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
# define __STATFS_MATCHES_STATFS64 1
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
#else
# define __RLIM_T_MATCHES_RLIM64_T 0
# define __STATFS_MATCHES_STATFS64 0
+
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
index e775e460bb..2bc87c1079 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
@@ -82,10 +82,16 @@
/* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
# define __STATFS_MATCHES_STATFS64 1
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
#else
# define __RLIM_T_MATCHES_RLIM64_T 0
# define __STATFS_MATCHES_STATFS64 0
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
#endif
/* Number of descriptors that can fit in an `fd_set'. */
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
index ac48c23e37..288a902b5f 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
@@ -76,10 +76,16 @@
/* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
# define __STATFS_MATCHES_STATFS64 1
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
#else
# define __RLIM_T_MATCHES_RLIM64_T 0
# define __STATFS_MATCHES_STATFS64 0
+
+/* And for getitimer, setitimer and rusage */
+# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
#endif
/* Number of descriptors that can fit in an `fd_set'. */
diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
index 87c50a4f32..f68dfecc90 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
@@ -94,6 +94,9 @@
# define __STATFS_MATCHES_STATFS64 0
#endif
+/* And for getitimer, setitimer and rusage */
+#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
--
2.25.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
2020-03-03 18:01 ` [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 Alistair Francis
@ 2020-03-27 17:58 ` Adhemerval Zanella
2020-03-27 18:36 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-03-27 17:58 UTC (permalink / raw)
To: Alistair Francis, libc-alpha
On 03/03/2020 14:53, Alistair Francis wrote:
> On y2038 safe 32-bit systems the Linux kernel expects itimerval
> and rusage to use a 32-bit time_t, even though the other time_t's
> are 64-bit.
I think it worth to mention kernel does not intend to implement
it and that timer_create should be used instead.
>
> There are also other occurances where the time passed to the kernel via
I think it is spelled 'occurrences'.
> timeval doesn't match the wordsize.
>
> To handle these cases let's define a new macro
> __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64. This macro specifies if the
> kernel's old_timeval matches the new timeval64. This should be true for
> 64-bit architectures (expect for Alpha) and x32.
I think you meant except. But you are making some confusion here
with both alpha and x32: both itimerval are use 64-bit time_t.
The issue for alpha is that what is different is old osf syscalls
uses 32-bit time_t and they are provided only as compat symbols.
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>> ---
> bits/typesizes.h | 6 ++++++
> sysdeps/unix/sysv/linux/alpha/bits/typesizes.h | 3 +++
> sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 6 ++++++
> sysdeps/unix/sysv/linux/s390/bits/typesizes.h | 6 ++++++
> sysdeps/unix/sysv/linux/sparc/bits/typesizes.h | 6 ++++++
> sysdeps/unix/sysv/linux/x86/bits/typesizes.h | 3 +++
> 6 files changed, 30 insertions(+)
>
> diff --git a/bits/typesizes.h b/bits/typesizes.h
> index 599408973e..8f16903a21 100644
> --- a/bits/typesizes.h
> +++ b/bits/typesizes.h
> @@ -76,10 +76,16 @@
>
> /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> # define __STATFS_MATCHES_STATFS64 1
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> #else
> # define __RLIM_T_MATCHES_RLIM64_T 0
>
> # define __STATFS_MATCHES_STATFS64 0
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> #endif
>
> /* Number of descriptors that can fit in an `fd_set'. */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> index 28ee3e5920..e5d7774468 100644
> --- a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> @@ -73,6 +73,9 @@
> /* Not for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> # define __STATFS_MATCHES_STATFS64 0
>
> +/* And for getitimer, setitimer and rusage */
> +#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> +
> /* Number of descriptors that can fit in an `fd_set'. */
> #define __FD_SETSIZE 1024
>
I think this is wrong, alpha does have a itimerval with 64-bit
time_t.
> diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> index 7c963e523e..4fb246ac74 100644
> --- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> @@ -77,11 +77,17 @@
>
> /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> # define __STATFS_MATCHES_STATFS64 1
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> #else
> # define __RLIM_T_MATCHES_RLIM64_T 0
>
> # define __STATFS_MATCHES_STATFS64 0
> +
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> #endif
> +
> /* Number of descriptors that can fit in an `fd_set'. */
> #define __FD_SETSIZE 1024
>
Ok.
> diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> index e775e460bb..2bc87c1079 100644
> --- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> @@ -82,10 +82,16 @@
>
> /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> # define __STATFS_MATCHES_STATFS64 1
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> #else
> # define __RLIM_T_MATCHES_RLIM64_T 0
>
> # define __STATFS_MATCHES_STATFS64 0
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> #endif
>
> /* Number of descriptors that can fit in an `fd_set'. */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> index ac48c23e37..288a902b5f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> @@ -76,10 +76,16 @@
>
> /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> # define __STATFS_MATCHES_STATFS64 1
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> #else
> # define __RLIM_T_MATCHES_RLIM64_T 0
>
> # define __STATFS_MATCHES_STATFS64 0
> +
> +/* And for getitimer, setitimer and rusage */
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> #endif
>
> /* Number of descriptors that can fit in an `fd_set'. */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> index 87c50a4f32..f68dfecc90 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> @@ -94,6 +94,9 @@
> # define __STATFS_MATCHES_STATFS64 0
> #endif
>
> +/* And for getitimer, setitimer and rusage */
> +#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> +
> /* Number of descriptors that can fit in an `fd_set'. */
> #define __FD_SETSIZE 1024
>
>
This is wrong for i686.
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
2020-03-27 17:58 ` Adhemerval Zanella
@ 2020-03-27 18:36 ` Alistair Francis
0 siblings, 0 replies; 42+ messages in thread
From: Alistair Francis @ 2020-03-27 18:36 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, GNU C Library
On Fri, Mar 27, 2020 at 10:58 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
>
>
> On 03/03/2020 14:53, Alistair Francis wrote:
> > On y2038 safe 32-bit systems the Linux kernel expects itimerval
> > and rusage to use a 32-bit time_t, even though the other time_t's
> > are 64-bit.
>
> I think it worth to mention kernel does not intend to implement
> it and that timer_create should be used instead.
I haved added a sentence here.
>
> >
> > There are also other occurances where the time passed to the kernel via
>
> I think it is spelled 'occurrences'.
Fixed
>
> > timeval doesn't match the wordsize.
> >
> > To handle these cases let's define a new macro
> > __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64. This macro specifies if the
> > kernel's old_timeval matches the new timeval64. This should be true for
> > 64-bit architectures (expect for Alpha) and x32.
>
> I think you meant except. But you are making some confusion here
> with both alpha and x32: both itimerval are use 64-bit time_t.
> The issue for alpha is that what is different is old osf syscalls
> uses 32-bit time_t and they are provided only as compat symbols.
I have fixed some mistakes here.
>
> >
> > Reviewed-by: Lukasz Majewski <lukma@denx.de>> ---
> > bits/typesizes.h | 6 ++++++
> > sysdeps/unix/sysv/linux/alpha/bits/typesizes.h | 3 +++
> > sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 6 ++++++
> > sysdeps/unix/sysv/linux/s390/bits/typesizes.h | 6 ++++++
> > sysdeps/unix/sysv/linux/sparc/bits/typesizes.h | 6 ++++++
> > sysdeps/unix/sysv/linux/x86/bits/typesizes.h | 3 +++
> > 6 files changed, 30 insertions(+)
> >
> > diff --git a/bits/typesizes.h b/bits/typesizes.h
> > index 599408973e..8f16903a21 100644
> > --- a/bits/typesizes.h
> > +++ b/bits/typesizes.h
> > @@ -76,10 +76,16 @@
> >
> > /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> > # define __STATFS_MATCHES_STATFS64 1
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> > #else
> > # define __RLIM_T_MATCHES_RLIM64_T 0
> >
> > # define __STATFS_MATCHES_STATFS64 0
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> > #endif
> >
> > /* Number of descriptors that can fit in an `fd_set'. */
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> > index 28ee3e5920..e5d7774468 100644
> > --- a/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> > +++ b/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
> > @@ -73,6 +73,9 @@
> > /* Not for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> > # define __STATFS_MATCHES_STATFS64 0
> >
> > +/* And for getitimer, setitimer and rusage */
> > +#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> > +
> > /* Number of descriptors that can fit in an `fd_set'. */
> > #define __FD_SETSIZE 1024
> >
>
> I think this is wrong, alpha does have a itimerval with 64-bit
> time_t.
Ok, I have fixed this.
>
> > diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> > index 7c963e523e..4fb246ac74 100644
> > --- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> > +++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> > @@ -77,11 +77,17 @@
> >
> > /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> > # define __STATFS_MATCHES_STATFS64 1
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> > #else
> > # define __RLIM_T_MATCHES_RLIM64_T 0
> >
> > # define __STATFS_MATCHES_STATFS64 0
> > +
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> > #endif
> > +
> > /* Number of descriptors that can fit in an `fd_set'. */
> > #define __FD_SETSIZE 1024
> >
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> > index e775e460bb..2bc87c1079 100644
> > --- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> > +++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
> > @@ -82,10 +82,16 @@
> >
> > /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> > # define __STATFS_MATCHES_STATFS64 1
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> > #else
> > # define __RLIM_T_MATCHES_RLIM64_T 0
> >
> > # define __STATFS_MATCHES_STATFS64 0
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> > #endif
> >
> > /* Number of descriptors that can fit in an `fd_set'. */
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> > index ac48c23e37..288a902b5f 100644
> > --- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> > +++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
> > @@ -76,10 +76,16 @@
> >
> > /* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t. */
> > # define __STATFS_MATCHES_STATFS64 1
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> > #else
> > # define __RLIM_T_MATCHES_RLIM64_T 0
> >
> > # define __STATFS_MATCHES_STATFS64 0
> > +
> > +/* And for getitimer, setitimer and rusage */
> > +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
> > #endif
> >
> > /* Number of descriptors that can fit in an `fd_set'. */
>
> Ok.
>
> > diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> > index 87c50a4f32..f68dfecc90 100644
> > --- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> > +++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
> > @@ -94,6 +94,9 @@
> > # define __STATFS_MATCHES_STATFS64 0
> > #endif
> >
> > +/* And for getitimer, setitimer and rusage */
> > +#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> > +
> > /* Number of descriptors that can fit in an `fd_set'. */
> > #define __FD_SETSIZE 1024
> >
> >
>
> This is wrong for i686.
Fixed.
Alistair
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-03-03 18:01 [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Alistair Francis
` (7 preceding siblings ...)
2020-03-03 18:01 ` [PATCH v5 4/8] sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 Alistair Francis
@ 2020-04-04 13:58 ` Andreas Schwab
2020-04-06 13:24 ` Adhemerval Zanella
8 siblings, 1 reply; 42+ messages in thread
From: Andreas Schwab @ 2020-04-04 13:58 UTC (permalink / raw)
To: Alistair Francis; +Cc: libc-alpha, adhemerval.zanella
One of the patches in the series has broken the ABI for all 32-bit
architectures.
0bcd0c5100 sysv/alpha: Use generic __timeval32 and helpers
600f00b747 linux: Use long time_t for wait4/getrusage
5d24ba82c4 resource: Add a __rusage64 struct
a51e035889 linux: Use long time_t __getitimer/__setitimer
1c634e677f sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-04 13:58 ` [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls Andreas Schwab
@ 2020-04-06 13:24 ` Adhemerval Zanella
2020-04-06 14:03 ` Andreas Schwab
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-06 13:24 UTC (permalink / raw)
To: Andreas Schwab, Alistair Francis; +Cc: libc-alpha
On 04/04/2020 10:58, Andreas Schwab wrote:
> One of the patches in the series has broken the ABI for all 32-bit
> architectures.
>
> 0bcd0c5100 sysv/alpha: Use generic __timeval32 and helpers
> 600f00b747 linux: Use long time_t for wait4/getrusage
> 5d24ba82c4 resource: Add a __rusage64 struct
> a51e035889 linux: Use long time_t __getitimer/__setitimer
> 1c634e677f sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
>
Which failure are you seeing? I am not seeing any regression on
i686-linux-gnu at least. I will check on other ABIs.
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 13:24 ` Adhemerval Zanella
@ 2020-04-06 14:03 ` Andreas Schwab
2020-04-06 16:16 ` Adhemerval Zanella
0 siblings, 1 reply; 42+ messages in thread
From: Andreas Schwab @ 2020-04-06 14:03 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, libc-alpha
On Apr 06 2020, Adhemerval Zanella wrote:
> On 04/04/2020 10:58, Andreas Schwab wrote:
>> One of the patches in the series has broken the ABI for all 32-bit
>> architectures.
>>
>> 0bcd0c5100 sysv/alpha: Use generic __timeval32 and helpers
>> 600f00b747 linux: Use long time_t for wait4/getrusage
>> 5d24ba82c4 resource: Add a __rusage64 struct
>> a51e035889 linux: Use long time_t __getitimer/__setitimer
>> 1c634e677f sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
>>
>
> Which failure are you seeing?
[ 24s] [ 10.164945] sysrq: Changing Loglevel
[ 24s] [ 10.164997] sysrq: Loglevel set to 4
[ 24s] Setting up swapspace version 1, size = 1024 MiB (1073676288 bytes)
[ 24s] no label, UUID=c7fc94c6-28a5-4bf9-a465-52f5926b0054
[ 24s] swapon: /dev/vdb: found signature [pagesize=65536, signature=swap]
[ 24s] swapon: /dev/vdb: pagesize=65536, swapsize=1073741824, devsize=1073741824
[ 24s] swapon /dev/vdb
[ 24s] WARNING: udev not running, creating extra device nodes
[ 24s] logging output to //.build.log...
[ 24s] processing recipe /.build-srcdir/glibc.spec ...
[ 24s] /.build/build-vm: line 501: 382 Segmentation fault $0 "$@"
[ 24s]
[ 24s] failed "build glibc.spec" at Sat Apr 4 02:17:45 UTC 2020.
[ 24s]
[ 24s] [ 10.303401] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
[ 24s] [ 10.303503] CPU: 3 PID: 1 Comm: build Not tainted 5.6.0-1-default #1 openSUSE Tumbleweed (unreleased)
[ 24s] [ 10.303611] Call Trace:
[ 24s] [ 10.303654] [c000000003753940] [c000000000d79ec0] .dump_stack+0xec/0x15c (unreliable)
[ 24s] [ 10.303754] [c0000000037539e0] [c00000000016ff9c] .panic+0x16c/0x420
[ 24s] [ 10.303837] [c000000003753a90] [c00000000017825c] .do_exit+0xbcc/0xc60
[ 24s] [ 10.303921] [c000000003753b60] [c0000000001783c0] .do_group_exit+0x60/0xd0
[ 24s] [ 10.304007] [c000000003753bf0] [c00000000018c584] .get_signal+0x1e4/0xbf0
[ 24s] [ 10.304093] [c000000003753d20] [c000000000023e0c] .do_notify_resume+0x1cc/0x460
[ 24s] [ 10.304191] [c000000003753e20] [c00000000000e3c4] .ret_from_except_lite+0x70/0x74
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 14:03 ` Andreas Schwab
@ 2020-04-06 16:16 ` Adhemerval Zanella
2020-04-06 17:07 ` Andreas Schwab
0 siblings, 1 reply; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-06 16:16 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Alistair Francis, libc-alpha
On 06/04/2020 11:03, Andreas Schwab wrote:
> On Apr 06 2020, Adhemerval Zanella wrote:
>
>> On 04/04/2020 10:58, Andreas Schwab wrote:
>>> One of the patches in the series has broken the ABI for all 32-bit
>>> architectures.
>>>
>>> 0bcd0c5100 sysv/alpha: Use generic __timeval32 and helpers
>>> 600f00b747 linux: Use long time_t for wait4/getrusage
>>> 5d24ba82c4 resource: Add a __rusage64 struct
>>> a51e035889 linux: Use long time_t __getitimer/__setitimer
>>> 1c634e677f sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
>>>
>>
>> Which failure are you seeing?
>
> [ 24s] [ 10.164945] sysrq: Changing Loglevel
> [ 24s] [ 10.164997] sysrq: Loglevel set to 4
> [ 24s] Setting up swapspace version 1, size = 1024 MiB (1073676288 bytes)
> [ 24s] no label, UUID=c7fc94c6-28a5-4bf9-a465-52f5926b0054
> [ 24s] swapon: /dev/vdb: found signature [pagesize=65536, signature=swap]
> [ 24s] swapon: /dev/vdb: pagesize=65536, swapsize=1073741824, devsize=1073741824
> [ 24s] swapon /dev/vdb
> [ 24s] WARNING: udev not running, creating extra device nodes
> [ 24s] logging output to //.build.log...
> [ 24s] processing recipe /.build-srcdir/glibc.spec ...
> [ 24s] /.build/build-vm: line 501: 382 Segmentation fault $0 "$@"
> [ 24s]
> [ 24s] failed "build glibc.spec" at Sat Apr 4 02:17:45 UTC 2020.
> [ 24s]
> [ 24s] [ 10.303401] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
> [ 24s] [ 10.303503] CPU: 3 PID: 1 Comm: build Not tainted 5.6.0-1-default #1 openSUSE Tumbleweed (unreleased)
> [ 24s] [ 10.303611] Call Trace:
> [ 24s] [ 10.303654] [c000000003753940] [c000000000d79ec0] .dump_stack+0xec/0x15c (unreliable)
> [ 24s] [ 10.303754] [c0000000037539e0] [c00000000016ff9c] .panic+0x16c/0x420
> [ 24s] [ 10.303837] [c000000003753a90] [c00000000017825c] .do_exit+0xbcc/0xc60
> [ 24s] [ 10.303921] [c000000003753b60] [c0000000001783c0] .do_group_exit+0x60/0xd0
> [ 24s] [ 10.304007] [c000000003753bf0] [c00000000018c584] .get_signal+0x1e4/0xbf0
> [ 24s] [ 10.304093] [c000000003753d20] [c000000000023e0c] .do_notify_resume+0x1cc/0x460
> [ 24s] [ 10.304191] [c000000003753e20] [c00000000000e3c4] .ret_from_except_lite+0x70/0x74
I am not familiar with build-vm command, which would be a easy
way to try reproduce it? Does it issue {get,set}itimer by
chance?
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 16:16 ` Adhemerval Zanella
@ 2020-04-06 17:07 ` Andreas Schwab
2020-04-06 17:34 ` Adhemerval Zanella
0 siblings, 1 reply; 42+ messages in thread
From: Andreas Schwab @ 2020-04-06 17:07 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, libc-alpha
On Apr 06 2020, Adhemerval Zanella wrote:
> I am not familiar with build-vm command, which would be a easy
> way to try reproduce it?
Just run any shell script.
See <878sjb5mml.fsf@igel.home>.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 17:07 ` Andreas Schwab
@ 2020-04-06 17:34 ` Adhemerval Zanella
2020-04-06 17:43 ` Adhemerval Zanella
2020-04-06 17:48 ` Andreas Schwab
0 siblings, 2 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-06 17:34 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Alistair Francis, libc-alpha
On 06/04/2020 14:07, Andreas Schwab wrote:
> On Apr 06 2020, Adhemerval Zanella wrote:
>
>> I am not familiar with build-vm command, which would be a easy
>> way to try reproduce it?
>
> Just run any shell script.
>
> See <878sjb5mml.fsf@igel.home>.
>
> Andreas.
>
I built a bash 5.0 for i686 and I am trying to reproduce it
with master (4531ba8ebfedf):
i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
/tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
i686-linux-gnu$ cat test.sh
echo $@
i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
... +++ ===
What am I missing here?
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 17:34 ` Adhemerval Zanella
@ 2020-04-06 17:43 ` Adhemerval Zanella
2020-04-06 17:48 ` Andreas Schwab
1 sibling, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-06 17:43 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Alistair Francis, libc-alpha
On 06/04/2020 14:34, Adhemerval Zanella wrote:
>
>
> On 06/04/2020 14:07, Andreas Schwab wrote:
>> On Apr 06 2020, Adhemerval Zanella wrote:
>>
>>> I am not familiar with build-vm command, which would be a easy
>>> way to try reproduce it?
>>
>> Just run any shell script.
>>
>> See <878sjb5mml.fsf@igel.home>.
>>
>> Andreas.
>>
>
> I built a bash 5.0 for i686 and I am trying to reproduce it
> with master (4531ba8ebfedf):
>
> i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
> /tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
> i686-linux-gnu$ cat test.sh
> echo $@
> i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
> ... +++ ===
>
> What am I missing here?
>
Do I need a recent kernel with y2038 syscalls to trigger it?
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 17:34 ` Adhemerval Zanella
2020-04-06 17:43 ` Adhemerval Zanella
@ 2020-04-06 17:48 ` Andreas Schwab
2020-04-06 17:45 ` Alistair Francis
1 sibling, 1 reply; 42+ messages in thread
From: Andreas Schwab @ 2020-04-06 17:48 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Alistair Francis, libc-alpha
On Apr 06 2020, Adhemerval Zanella wrote:
> On 06/04/2020 14:07, Andreas Schwab wrote:
>> On Apr 06 2020, Adhemerval Zanella wrote:
>>
>>> I am not familiar with build-vm command, which would be a easy
>>> way to try reproduce it?
>>
>> Just run any shell script.
>>
>> See <878sjb5mml.fsf@igel.home>.
>>
>> Andreas.
>>
>
> I built a bash 5.0 for i686 and I am trying to reproduce it
> with master (4531ba8ebfedf):
>
> i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
> /tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
> i686-linux-gnu$ cat test.sh
> echo $@
> i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
> ... +++ ===
>
> What am I missing here?
Probably a modern kernel.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 17:48 ` Andreas Schwab
@ 2020-04-06 17:45 ` Alistair Francis
2020-04-06 18:02 ` Alistair Francis
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-04-06 17:45 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Adhemerval Zanella, GNU C Library, Alistair Francis
On Mon, Apr 6, 2020 at 10:48 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Apr 06 2020, Adhemerval Zanella wrote:
>
> > On 06/04/2020 14:07, Andreas Schwab wrote:
> >> On Apr 06 2020, Adhemerval Zanella wrote:
> >>
> >>> I am not familiar with build-vm command, which would be a easy
> >>> way to try reproduce it?
> >>
> >> Just run any shell script.
> >>
> >> See <878sjb5mml.fsf@igel.home>.
> >>
> >> Andreas.
> >>
> >
> > I built a bash 5.0 for i686 and I am trying to reproduce it
> > with master (4531ba8ebfedf):
> >
> > i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
> > /tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
> > i686-linux-gnu$ cat test.sh
> > echo $@
> > i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
> > ... +++ ===
> >
> > What am I missing here?
>
> Probably a modern kernel.
I'm building a ARMv7 rootFS and 5.4 kernel now. I'll try to reproduce
the problem.
Alistair
>
> Andreas.
>
> --
> Andreas Schwab, schwab@linux-m68k.org
> GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
> "And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 17:45 ` Alistair Francis
@ 2020-04-06 18:02 ` Alistair Francis
2020-04-06 18:21 ` Adhemerval Zanella
0 siblings, 1 reply; 42+ messages in thread
From: Alistair Francis @ 2020-04-06 18:02 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Adhemerval Zanella, GNU C Library, Alistair Francis
On Mon, Apr 6, 2020 at 10:45 AM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Mon, Apr 6, 2020 at 10:48 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
> >
> > On Apr 06 2020, Adhemerval Zanella wrote:
> >
> > > On 06/04/2020 14:07, Andreas Schwab wrote:
> > >> On Apr 06 2020, Adhemerval Zanella wrote:
> > >>
> > >>> I am not familiar with build-vm command, which would be a easy
> > >>> way to try reproduce it?
> > >>
> > >> Just run any shell script.
> > >>
> > >> See <878sjb5mml.fsf@igel.home>.
> > >>
> > >> Andreas.
> > >>
> > >
> > > I built a bash 5.0 for i686 and I am trying to reproduce it
> > > with master (4531ba8ebfedf):
> > >
> > > i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
> > > /tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
> > > i686-linux-gnu$ cat test.sh
> > > echo $@
> > > i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
> > > ... +++ ===
> > >
> > > What am I missing here?
> >
> > Probably a modern kernel.
>
> I'm building a ARMv7 rootFS and 5.4 kernel now. I'll try to reproduce
> the problem.
I have what I think is a fix based on some other comments on the list.
Testing now then I'll send the patch.
This is the diff:
diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
index d14bd4da27..796691eb2b 100644
--- a/sysdeps/unix/sysv/linux/wait4.c
+++ b/sysdeps/unix/sysv/linux/wait4.c
@@ -32,10 +32,7 @@ __wait4_time64 (pid_t pid, int *stat_loc, int
options, struct __rusage64 *usage)
struct __rusage32 usage32;
pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
- if (ret != 0)
- return ret;
-
- if (usage != NULL)
+ if (ret > 0 && usage != NULL)
rusage32_to_rusage64 (&usage32, usage);
return ret;
@@ -119,10 +116,8 @@ __wait4 (pid_t pid, int *stat_loc, int options,
struct rusage *usage)
ret = __wait4_time64 (pid, stat_loc, options, &usage64);
- if (ret != 0)
- return ret;
-
- rusage64_to_rusage (&usage64, usage);
+ if (ret > 0 && usage != NULL)
+ rusage64_to_rusage (&usage64, usage);
return ret;
}
Alistair
>
> Alistair
>
> >
> > Andreas.
> >
> > --
> > Andreas Schwab, schwab@linux-m68k.org
> > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
> > "And now for something completely different."
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCH v5 0/8] Always use 32-bit time_t for certain syscalls
2020-04-06 18:02 ` Alistair Francis
@ 2020-04-06 18:21 ` Adhemerval Zanella
0 siblings, 0 replies; 42+ messages in thread
From: Adhemerval Zanella @ 2020-04-06 18:21 UTC (permalink / raw)
To: Alistair Francis, Andreas Schwab; +Cc: GNU C Library, Alistair Francis
On 06/04/2020 15:02, Alistair Francis wrote:
> On Mon, Apr 6, 2020 at 10:45 AM Alistair Francis <alistair23@gmail.com> wrote:
>>
>> On Mon, Apr 6, 2020 at 10:48 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>>>
>>> On Apr 06 2020, Adhemerval Zanella wrote:
>>>
>>>> On 06/04/2020 14:07, Andreas Schwab wrote:
>>>>> On Apr 06 2020, Adhemerval Zanella wrote:
>>>>>
>>>>>> I am not familiar with build-vm command, which would be a easy
>>>>>> way to try reproduce it?
>>>>>
>>>>> Just run any shell script.
>>>>>
>>>>> See <878sjb5mml.fsf@igel.home>.
>>>>>
>>>>> Andreas.
>>>>>
>>>>
>>>> I built a bash 5.0 for i686 and I am trying to reproduce it
>>>> with master (4531ba8ebfedf):
>>>>
>>>> i686-linux-gnu$ file /tmp/bash-5.0/install/bin/bash
>>>> /tmp/bash-5.0/install/bin/bash: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /lib/ld-, BuildID[sha1]=7468b3013138231097ec41a9b35826febc576939, for GNU/Linux 3.2.0, with debug_info, not stripped
>>>> i686-linux-gnu$ cat test.sh
>>>> echo $@
>>>> i686-linux-gnu$ ./testrun.sh /tmp/bash-5.0/install/bin/bash ./test.sh ... +++ ===
>>>> ... +++ ===
>>>>
>>>> What am I missing here?
>>>
>>> Probably a modern kernel.
>>
>> I'm building a ARMv7 rootFS and 5.4 kernel now. I'll try to reproduce
>> the problem.
>
> I have what I think is a fix based on some other comments on the list.
> Testing now then I'll send the patch.
>
> This is the diff:
> diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c
> index d14bd4da27..796691eb2b 100644
> --- a/sysdeps/unix/sysv/linux/wait4.c
> +++ b/sysdeps/unix/sysv/linux/wait4.c
> @@ -32,10 +32,7 @@ __wait4_time64 (pid_t pid, int *stat_loc, int
> options, struct __rusage64 *usage)
> struct __rusage32 usage32;
> pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32);
>
> - if (ret != 0)
> - return ret;
> -
> - if (usage != NULL)
> + if (ret > 0 && usage != NULL)
> rusage32_to_rusage64 (&usage32, usage);
>
> return ret;
> @@ -119,10 +116,8 @@ __wait4 (pid_t pid, int *stat_loc, int options,
> struct rusage *usage)
>
> ret = __wait4_time64 (pid, stat_loc, options, &usage64);
>
> - if (ret != 0)
> - return ret;
> -
> - rusage64_to_rusage (&usage64, usage);
> + if (ret > 0 && usage != NULL)
> + rusage64_to_rusage (&usage64, usage);
>
> return ret;
> }
It seems to be issue, this small testcase reproduces it:
--
#include <unistd.h>
#include <stdlib.h>
#include <sys/wait.h>
int main (int argc, char *argv[])
{
pid_t child = fork ();
if (child == 0)
{
pause ();
exit (0);
}
wait4 (child, &(int){0}, WNOHANG, NULL);
kill (child, SIGKILL);
return 0;
}
--
Please post the fix upstream.
^ permalink raw reply [flat|nested] 42+ messages in thread