qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libsupport: Add 64-bit time_t support for time functions 

The patch adds redirections for xclock_gettime, xclock_settime,
timespec_add, timespec_sub, test_timespec_before_impl,
test_timespec_equal_or_after_impl, support_timespec_ns,
support_timespec_normalize, and support_timespec_check_in_range when
_TIME_BITS=64 is defined.

Co-authored-by: Lukasz Majewski <lukma@denx.de>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2021-02-25 16:57:25 -03:00
parent 19873b18b0
commit e9bc2b3b38
11 changed files with 204 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
support/Makefile
View File

@ -83,8 +83,11 @@ libsupport-routines = \
support_test_verify_impl \ support_test_verify_impl \
temp_file \ temp_file \
timespec \ timespec \
timespec-time64 \
timespec-add \ timespec-add \
timespec-add-time64 \
timespec-sub \ timespec-sub \
timespec-sub-time64 \
write_message \ write_message \
xaccept \ xaccept \
xaccept4 \ xaccept4 \
@ -94,7 +97,9 @@ libsupport-routines = \
xchdir \ xchdir \
xchroot \ xchroot \
xclock_gettime \ xclock_gettime \
xclock_gettime_time64 \
xclock_settime \ xclock_settime \
xclock_settime_time64 \
xclose \ xclose \
xchmod \ xchmod \
xconnect \ xconnect \
@ -216,6 +221,7 @@ CFLAGS-support_paths.c = \
# in support_timespec_check_in_range and for that computation we use # in support_timespec_check_in_range and for that computation we use
# -fexcess-precision=standard. # -fexcess-precision=standard.
CFLAGS-timespec.c += -fexcess-precision=standard CFLAGS-timespec.c += -fexcess-precision=standard
CFLAGS-timespec-time64.c += -fexcess-precision=standard
ifeq (,$(CXX)) ifeq (,$(CXX))
LINKS_DSO_PROGRAM = links-dso-program-c LINKS_DSO_PROGRAM = links-dso-program-c

27
support/timespec-add-time64.c Normal file
View File

@ -0,0 +1,27 @@
/* Add two struct __timespec64 values. 64-bit time support.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
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
<https://www.gnu.org/licenses/>. */
#include <time.h>
#if __TIMESIZE != 64
# define timespec __timespec64
# define time_t __time64_t
# define timespec_add timespec_add_time64
# include "timespec-add.c"
#endif

2
support/timespec-add.c
View File

@ -61,5 +61,5 @@ timespec_add (struct timespec a, struct timespec b)
} }
} }
return make_timespec (rs, rns); return (struct timespec) { .tv_sec = rs, .tv_nsec = rns };
} }

27
support/timespec-sub-time64.c Normal file
View File

@ -0,0 +1,27 @@
/* Subtract two struct __timespec64 values. 64-bit time support.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library and is also part of gnulib.
Patches to this file should be submitted to both projects.
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
<https://www.gnu.org/licenses/>. */
#include <time.h>
#if __TIMESIZE != 64
# define timespec __timespec64
# define time_t __time64_t
# define timespec_sub timespec_sub_time64
# include "timespec-sub.c"
#endif

2
support/timespec-sub.c
View File

@ -61,5 +61,5 @@ timespec_sub (struct timespec a, struct timespec b)
} }
} }
return make_timespec (rs, rns); return (struct timespec) { .tv_sec = rs, .tv_nsec = rns };
} }

40
support/timespec-time64.c Normal file
View File

@ -0,0 +1,40 @@
/* Support code for timespec checks. 64-bit time support.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <support/timespec.h>
#include <stdio.h>
#include <stdint.h>
#include <assert.h>
#include <intprops.h>
#if __TIMESIZE != 64
struct __timespec64 timespec_sub_time64 (struct __timespec64,
struct __timespec64);
#define test_timespec_before_impl test_timespec_before_impl_time64
#define test_timespec_equal_or_after_impl \
test_timespec_equal_or_after_impl_time64
#define support_timespec_ns support_timespec_ns_time64
#define support_timespec_normalize support_timespec_normalize_time64
#define support_timespec_check_in_range \
support_timespec_check_in_range_time64
#define timespec __timespec64
#define timespec_sub timespec_sub_time64
#include "timespec.c"
#endif

9
support/timespec.c
View File

@ -23,9 +23,8 @@
#include <intprops.h> #include <intprops.h>
void void
test_timespec_before_impl (const char *file, int line, test_timespec_before_impl (const char *file, int line, struct timespec left,
const struct timespec left, struct timespec right)
const struct timespec right)
{ {
if (left.tv_sec > right.tv_sec if (left.tv_sec > right.tv_sec
|| (left.tv_sec == right.tv_sec || (left.tv_sec == right.tv_sec
@ -43,8 +42,8 @@ test_timespec_before_impl (const char *file, int line,
void void
test_timespec_equal_or_after_impl (const char *file, int line, test_timespec_equal_or_after_impl (const char *file, int line,
const struct timespec left, struct timespec left,
const struct timespec right) struct timespec right)
{ {
if (left.tv_sec < right.tv_sec if (left.tv_sec < right.tv_sec
|| (left.tv_sec == right.tv_sec || (left.tv_sec == right.tv_sec

48
support/timespec.h
View File

@ -24,11 +24,6 @@
#include <support/check.h> #include <support/check.h>
#include <support/xtime.h> #include <support/xtime.h>
struct timespec timespec_add (struct timespec, struct timespec)
__attribute__((const));
struct timespec timespec_sub (struct timespec, struct timespec)
__attribute__((const));
static inline struct timespec static inline struct timespec
make_timespec (time_t s, long int ns) make_timespec (time_t s, long int ns)
{ {
@ -40,21 +35,54 @@ make_timespec (time_t s, long int ns)
enum { TIMESPEC_HZ = 1000000000 }; enum { TIMESPEC_HZ = 1000000000 };
#ifndef __USE_TIME_BITS64
struct timespec timespec_add (struct timespec, struct timespec)
__attribute__((const));
struct timespec timespec_sub (struct timespec, struct timespec)
__attribute__((const));
void test_timespec_before_impl (const char *file, int line, void test_timespec_before_impl (const char *file, int line,
const struct timespec left, struct timespec left,
const struct timespec right); struct timespec right);
void test_timespec_equal_or_after_impl (const char *file, int line, void test_timespec_equal_or_after_impl (const char *file, int line,
const struct timespec left, struct timespec left,
const struct timespec right); struct timespec right);
time_t support_timespec_ns (struct timespec time); time_t support_timespec_ns (struct timespec time);
struct timespec support_timespec_normalize (struct timespec time); struct timespec support_timespec_normalize (struct timespec time);
int support_timespec_check_in_range (struct timespec expected, struct timespec observed, int support_timespec_check_in_range (struct timespec expected,
struct timespec observed,
double lower_bound, double upper_bound); double lower_bound, double upper_bound);
#else
struct timespec __REDIRECT (timespec_add, (struct timespec, struct timespec),
timespec_add_time64);
struct timespec __REDIRECT (timespec_sub, (struct timespec, struct timespec),
timespec_sub_time64);
void __REDIRECT (test_timespec_before_impl, (const char *file, int line,
struct timespec left,
struct timespec right),
test_timespec_before_impl_time64);
void __REDIRECT (test_timespec_equal_or_after_impl, (const char *f, int line,
struct timespec left,
struct timespec right),
test_timespec_equal_or_after_impl_time64);
time_t __REDIRECT (support_timespec_ns, (struct timespec time),
support_timespec_ns_time64);
struct timespec __REDIRECT (support_timespec_normalize, (struct timespec time),
support_timespec_normalize_time64);
int __REDIRECT (support_timespec_check_in_range, (struct timespec expected,
struct timespec observed,
double lower_bound,
double upper_bound),
support_timespec_check_in_range_time64);
#endif
/* Check that the timespec on the left represents a time before the /* Check that the timespec on the left represents a time before the
time on the right. */ time on the right. */

26
support/xclock_gettime_time64.c Normal file
View File

@ -0,0 +1,26 @@
/* clock_settime with error checking. 64-bit time_t support.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <support/xtime.h>
#if __TIMESIZE != 64
# define xclock_gettime xclock_gettime_time64
# define timespec __timespec64
# define clock_gettime __clock_gettime64
# include "xclock_gettime.c"
#endif

26
support/xclock_settime_time64.c Normal file
View File

@ -0,0 +1,26 @@
/* clock_settime helper with error checking - 64-bit time_t support.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <support/xtime.h>
#if __TIMESIZE != 64
# define xclock_settime xclock_settime_time64
# define timespec __timespec64
# define clock_settime __clock_settime64
# include "xclock_settime.c"
#endif

7
support/xtime.h
View File

@ -30,8 +30,15 @@ __BEGIN_DECLS
/* The following functions call the corresponding libc functions and /* The following functions call the corresponding libc functions and
terminate the process on error. */ terminate the process on error. */
#ifndef __USE_TIME_BITS64
void xclock_gettime (clockid_t clock, struct timespec *ts); void xclock_gettime (clockid_t clock, struct timespec *ts);
void xclock_settime (clockid_t clock, const struct timespec *ts); void xclock_settime (clockid_t clock, const struct timespec *ts);
#else
void __REDIRECT (xclock_gettime, (clockid_t clock, struct timespec *ts),
xclock_gettime_time64);
void __REDIRECT (xclock_settime, (clockid_t clock, const struct timespec *ts),
xclock_settime_time64);
#endif
/* This helper can often simplify tests by avoiding an explicit /* This helper can often simplify tests by avoiding an explicit
variable declaration or allowing that declaration to be const. */ variable declaration or allowing that declaration to be const. */