AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup clock_*time includes

Browse Source 
Clock_gettime, settime and getres implementations are unncessarily
complex due to using defines and C file inclusion.  Simplify the
code by replacing the redundant defines and removing the inclusion,
making it much easier to understand.  No functional changes.

	* sysdeps/posix/clock_getres.c (__clock_getres): Cleanup.
	* sysdeps/unix/clock_gettime.c (__clock_gettime): Cleanup.
	* sysdeps/unix/clock_settime.c (__clock_settime): Cleanup.
	* sysdeps/unix/sysv/linux/clock_getres.c (__clock_getres): Cleanup.
	* sysdeps/unix/sysv/linux/clock_gettime.c (__clock_gettime): Cleanup.
	* sysdeps/unix/sysv/linux/clock_settime.c (__clock_settime): Cleanup.
This commit is contained in:
Wilco Dijkstra 2019-02-01 12:19:42 +00:00
parent 83d1cc42d8
commit b06f4c0094
7 changed files with 45 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-02-01 Wilco Dijkstra <wdijkstr@arm.com>
* sysdeps/posix/clock_getres.c (__clock_getres): Cleanup.
* sysdeps/unix/clock_gettime.c (__clock_gettime): Cleanup.
* sysdeps/unix/clock_settime.c (__clock_settime): Cleanup.
* sysdeps/unix/sysv/linux/clock_getres.c (__clock_getres): Cleanup.
* sysdeps/unix/sysv/linux/clock_gettime.c (__clock_gettime): Cleanup.
* sysdeps/unix/sysv/linux/clock_settime.c (__clock_settime): Cleanup.
2019-02-01 Feng Xue <fxue@os.amperecomputing.com> 2019-02-01 Feng Xue <fxue@os.amperecomputing.com>
* sysdeps/aarch64/memchr.S (__memchr): Rename to MEMCHR. * sysdeps/aarch64/memchr.S (__memchr): Rename to MEMCHR.

11
sysdeps/posix/clock_getres.c
View File

@ -82,20 +82,11 @@ __clock_getres (clockid_t clock_id, struct timespec *res)
switch (clock_id) switch (clock_id)
{ {
#ifdef SYSDEP_GETRES
SYSDEP_GETRES;
#endif
#ifndef HANDLED_REALTIME
case CLOCK_REALTIME: case CLOCK_REALTIME:
retval = realtime_getres (res); retval = realtime_getres (res);
break; break;
#endif /* handled REALTIME */
default: default:
#ifdef SYSDEP_GETRES_CPU
SYSDEP_GETRES_CPU;
#endif
#if HP_TIMING_AVAIL #if HP_TIMING_AVAIL
if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1)) if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1))
== CLOCK_THREAD_CPUTIME_ID) == CLOCK_THREAD_CPUTIME_ID)
@ -105,7 +96,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res)
__set_errno (EINVAL); __set_errno (EINVAL);
break; break;
#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME #if HP_TIMING_AVAIL
case CLOCK_PROCESS_CPUTIME_ID: case CLOCK_PROCESS_CPUTIME_ID:
case CLOCK_THREAD_CPUTIME_ID: case CLOCK_THREAD_CPUTIME_ID:
retval = hp_timing_getres (res); retval = hp_timing_getres (res);

11
sysdeps/unix/clock_gettime.c
View File

@ -95,11 +95,6 @@ __clock_gettime (clockid_t clock_id, struct timespec *tp)
switch (clock_id) switch (clock_id)
{ {
#ifdef SYSDEP_GETTIME
SYSDEP_GETTIME;
#endif
#ifndef HANDLED_REALTIME
case CLOCK_REALTIME: case CLOCK_REALTIME:
{ {
struct timeval tv; struct timeval tv;
@ -108,12 +103,8 @@ __clock_gettime (clockid_t clock_id, struct timespec *tp)
TIMEVAL_TO_TIMESPEC (&tv, tp); TIMEVAL_TO_TIMESPEC (&tv, tp);
} }
break; break;
#endif
default: default:
#ifdef SYSDEP_GETTIME_CPU
SYSDEP_GETTIME_CPU (clock_id, tp);
#endif
#if HP_TIMING_AVAIL #if HP_TIMING_AVAIL
if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1)) if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1))
== CLOCK_THREAD_CPUTIME_ID) == CLOCK_THREAD_CPUTIME_ID)
@ -123,7 +114,7 @@ __clock_gettime (clockid_t clock_id, struct timespec *tp)
__set_errno (EINVAL); __set_errno (EINVAL);
break; break;
#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME #if HP_TIMING_AVAIL
case CLOCK_PROCESS_CPUTIME_ID: case CLOCK_PROCESS_CPUTIME_ID:
retval = hp_timing_gettime (clock_id, tp); retval = hp_timing_gettime (clock_id, tp);
break; break;

27
sysdeps/unix/clock_settime.c
View File

@ -21,7 +21,7 @@
#include <ldsodefs.h> #include <ldsodefs.h>
#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME #if HP_TIMING_AVAIL
/* Clock frequency of the processor. We make it a 64-bit variable /* Clock frequency of the processor. We make it a 64-bit variable
because some jokers are already playing with processors with more because some jokers are already playing with processors with more
than 4GHz. */ than 4GHz. */
@ -84,29 +84,15 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp)
switch (clock_id) switch (clock_id)
{ {
#define HANDLE_REALTIME \
do { \
struct timeval tv; \
TIMESPEC_TO_TIMEVAL (&tv, tp); \
\
retval = __settimeofday (&tv, NULL); \
} while (0)
#ifdef SYSDEP_SETTIME
SYSDEP_SETTIME;
#endif
#ifndef HANDLED_REALTIME
case CLOCK_REALTIME: case CLOCK_REALTIME:
HANDLE_REALTIME; {
struct timeval tv;
TIMESPEC_TO_TIMEVAL (&tv, tp);
retval = __settimeofday (&tv, NULL);
}
break; break;
#endif
default: default:
#ifdef SYSDEP_SETTIME_CPU
SYSDEP_SETTIME_CPU;
#endif
#ifndef HANDLED_CPUTIME
# if HP_TIMING_AVAIL # if HP_TIMING_AVAIL
if (CPUCLOCK_WHICH (clock_id) == CLOCK_PROCESS_CPUTIME_ID if (CPUCLOCK_WHICH (clock_id) == CLOCK_PROCESS_CPUTIME_ID
|| CPUCLOCK_WHICH (clock_id) == CLOCK_THREAD_CPUTIME_ID) || CPUCLOCK_WHICH (clock_id) == CLOCK_THREAD_CPUTIME_ID)
@ -117,7 +103,6 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp)
__set_errno (EINVAL); __set_errno (EINVAL);
retval = -1; retval = -1;
} }
#endif
break; break;
} }

30
sysdeps/unix/sysv/linux/clock_getres.c
View File

@ -26,26 +26,10 @@
#endif #endif
#include <sysdep-vdso.h> #include <sysdep-vdso.h>
#define SYSCALL_GETRES \ /* Get resolution of clock. */
retval = INLINE_VSYSCALL (clock_getres, 2, clock_id, res); \ int
break __clock_getres (clockid_t clock_id, struct timespec *res)
{
/* The REALTIME and MONOTONIC clock are definitely supported in the return INLINE_VSYSCALL (clock_getres, 2, clock_id, res);
kernel. */ }
#define SYSDEP_GETRES \ weak_alias (__clock_getres, clock_getres)
SYSDEP_GETRES_CPUTIME \
case CLOCK_REALTIME: \
case CLOCK_MONOTONIC: \
case CLOCK_MONOTONIC_RAW: \
case CLOCK_REALTIME_COARSE: \
case CLOCK_MONOTONIC_COARSE: \
SYSCALL_GETRES
/* We handled the REALTIME clock here. */
#define HANDLED_REALTIME 1
#define HANDLED_CPUTIME 1
#define SYSDEP_GETRES_CPU SYSCALL_GETRES
#define SYSDEP_GETRES_CPUTIME /* Default catches them too. */
#include <sysdeps/posix/clock_getres.c>

27
sysdeps/unix/sysv/linux/clock_gettime.c
View File

@ -26,22 +26,11 @@
#endif #endif
#include <sysdep-vdso.h> #include <sysdep-vdso.h>
/* The REALTIME and MONOTONIC clock are definitely supported in the /* Get current value of CLOCK and store it in TP. */
kernel. */ int
#define SYSDEP_GETTIME \ __clock_gettime (clockid_t clock_id, struct timespec *tp)
SYSDEP_GETTIME_CPUTIME; \ {
case CLOCK_REALTIME: \ return INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp);
case CLOCK_MONOTONIC: \ }
retval = INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp); \ weak_alias (__clock_gettime, clock_gettime)
break libc_hidden_def (__clock_gettime)
/* We handled the REALTIME clock here. */
#define HANDLED_REALTIME 1
#define HANDLED_CPUTIME 1
#define SYSDEP_GETTIME_CPU(clock_id, tp) \
retval = INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp); \
break
#define SYSDEP_GETTIME_CPUTIME /* Default catches them too. */
#include <sysdeps/unix/clock_gettime.c>

27
sysdeps/unix/sysv/linux/clock_settime.c
View File

@ -21,18 +21,17 @@
#include "kernel-posix-cpu-timers.h" #include "kernel-posix-cpu-timers.h"
/* Set CLOCK to value TP. */
int
__clock_settime (clockid_t clock_id, const struct timespec *tp)
{
/* Make sure the time cvalue is OK. */
if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
{
__set_errno (EINVAL);
return -1;
}
/* The REALTIME clock is definitely supported in the kernel. */ return INLINE_SYSCALL_CALL (clock_settime, clock_id, tp);
#define SYSDEP_SETTIME \ }
case CLOCK_REALTIME: \ weak_alias (__clock_settime, clock_settime)
retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp); \
break
/* We handled the REALTIME clock here. */
#define HANDLED_REALTIME 1
#define HANDLED_CPUTIME 1
#define SYSDEP_SETTIME_CPU \
retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp)
#include <sysdeps/unix/clock_settime.c>