mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Consolidate generic gettimeofday implementation to use clock_gettime. Linux ports that still provide gettimeofday through vDSO are not changed. Remove sysdeps/unix/clock_gettime.c, which implemented clock_gettime using gettimeofday; new OS ports must provide a real implementation of clock_gettime. Rename sysdeps/mach/gettimeofday.c to sysdeps/mach/clock_gettime.c and convert into an implementation of clock_gettime. It only supports CLOCK_REALTIME; Mach does not appear to have any support for monotonic clocks. It uses __host_get_time, which provides at best microsecond resolution. Hurd is currently using sysdeps/posix/clock_getres.c for clock_getres; its output for CLOCK_REALTIME is based on sysconf (_SC_CLK_TCK), and I do not know whether that gives the correct result. Unlike settimeofday, there are no known uses of gettimeofday's vestigial "get time zone" feature that are not bugs. (The per-process timezone support in localtime and friends is unrelated, and the programs that set the kernel's offset between the hardware clock and UTC do not need to read it back.) Therefore, this feature is dummied out. Henceforth, if gettimeofday's "struct timezone" argument is not NULL, it will write zeroes to both fields. Any program that is actually looking at this data will thus think it is running in UTC, which is probably more correct than whatever it was doing before. [__]gettimeofday no longer has any internal callers, so we can now remove its internal prototype and PLT bypass aliases. The __gettimeofday@GLIBC_2.0 export remains, in case it is used by any third-party code. It also allows to simplify the arch-specific implementation on x86 and powerpc to remove the hack to disable the internal route to non iFUNC variant for internal symbol. This patch also fixes a missing optimization on aarch64, powerpc, and x86 where the code used on static build do not use the vDSO. Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu. Co-authored-by: Zack Weinberg <zackw@panix.com> Reviewed-by: Lukasz Majewski <lukma@denx.de>
125 lines
3.9 KiB
C
125 lines
3.9 KiB
C
/* Compatibility definitions for `struct timeval' with 32-bit time_t.
|
|
Copyright (C) 2019 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
|
|
valid_timeval_to_timeval64 (const struct timeval32 tv)
|
|
{
|
|
return (struct timeval) { tv.tv_sec, tv.tv_usec };
|
|
}
|
|
|
|
static inline struct timeval32
|
|
valid_timeval64_to_timeval (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
|
|
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 };
|
|
}
|
|
|
|
static inline void
|
|
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_timeval64_to_timeval (r64->ru_utime);
|
|
r32->ru_stime = valid_timeval64_to_timeval (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 */
|