mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 17:11:06 +00:00
f607047668
commit e9698175b0
Author: Lukasz Majewski <lukma@denx.de>
Date: Mon Mar 16 08:31:41 2020 +0100
y2038: Replace __clock_gettime with __clock_gettime64
breaks benchtests with sysdeps/generic/hp-timing.h:
In file included from ./bench-timing.h:23,
from ./bench-skeleton.c:25,
from
/export/build/gnu/tools-build/glibc-gitlab/build-x86_64-linux/benchtests/bench-rint.c:45:
./bench-skeleton.c: In function ‘main’:
../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ isn’t known
37 | struct __timespec64 tv; \
| ^~
Define HP_TIMING_NOW with clock_gettime in sysdeps/generic/hp-timing.h
if _ISOMAC is defined. Don't define __clock_gettime in bench-timing.h
since it is no longer needed.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
52 lines
1.7 KiB
C
52 lines
1.7 KiB
C
/* High precision, low overhead timing functions. Generic version.
|
|
Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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/>. */
|
|
|
|
#ifndef _HP_TIMING_H
|
|
#define _HP_TIMING_H 1
|
|
|
|
#include <time.h>
|
|
#include <stdint.h>
|
|
#include <hp-timing-common.h>
|
|
|
|
/* It should not be used for ld.so. */
|
|
#define HP_TIMING_INLINE (0)
|
|
|
|
typedef uint64_t hp_timing_t;
|
|
|
|
/* The clock_gettime (CLOCK_MONOTONIC) has unspecified starting time,
|
|
nano-second accuracy, and for some architectues is implemented as
|
|
vDSO symbol. */
|
|
#ifdef _ISOMAC
|
|
# define HP_TIMING_NOW(var) \
|
|
({ \
|
|
struct timespec tv; \
|
|
clock_gettime (CLOCK_MONOTONIC, &tv); \
|
|
(var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \
|
|
})
|
|
#else
|
|
# define HP_TIMING_NOW(var) \
|
|
({ \
|
|
struct __timespec64 tv; \
|
|
__clock_gettime64 (CLOCK_MONOTONIC, &tv); \
|
|
(var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \
|
|
})
|
|
#endif
|
|
|
|
#endif /* hp-timing.h */
|