mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
9090848d06
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar
to what was done with libc-diag.h, I have split the definitions of
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN
to a new header, libc-pointer-arith.h.
It then occurred to me that the remaining declarations in libc-internal.h
are mostly to do with early initialization, and probably most of the
files including it, even in the core code, don't need it anymore. Indeed,
only 19 files actually need what remains of libc-internal.h. 23 others
need libc-diag.h instead, and 12 need libc-pointer-arith.h instead.
No file needs more than one of them, and 16 don't need any of them!
So, with this patch, libc-internal.h stops including libc-diag.h as
well as losing the pointer arithmetic macros, and all including files
are adjusted.
* include/libc-pointer-arith.h: New file. Define
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and
PTR_ALIGN_DOWN here.
* include/libc-internal.h: Definitions of above macros
moved from here. Don't include libc-diag.h anymore either.
* posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h.
Don't include libc-internal.h.
* debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c
* io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c
* nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c
* string/strcoll_l.c, sysdeps/nacl/brk.c
* sysdeps/unix/clock_settime.c
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c
* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c:
Don't include libc-internal.h.
* elf/get-dynamic-info.h, iconv/loop.c
* iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h
* misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h
* nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c
* soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
* sysdeps/ieee754/dbl-64/k_rem_pio2.c
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
* sysdeps/ieee754/flt-32/k_rem_pio2f.c
* sysdeps/ieee754/ldbl-128/k_tanl.c
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
* sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h:
Include libc-diag.h instead of libc-internal.h.
* elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c
* nptl/nptl-init.c, string/strcspn.c, string/strspn.c
* malloc/malloc.c, sysdeps/i386/nptl/tls.h
* sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h
* sysdeps/unix/sysv/linux/spawni.c
* sysdeps/x86_64/nptl/tls.h:
Include libc-pointer-arith.h instead of libc-internal.h.
* elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h
* sysdeps/x86_64/atomic-machine.h:
Add multiple include guard.
127 lines
3.3 KiB
C
127 lines
3.3 KiB
C
/* Copyright (C) 1999-2017 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 <errno.h>
|
|
#include <time.h>
|
|
#include <sys/time.h>
|
|
#include <ldsodefs.h>
|
|
|
|
|
|
#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME
|
|
/* Clock frequency of the processor. We make it a 64-bit variable
|
|
because some jokers are already playing with processors with more
|
|
than 4GHz. */
|
|
static hp_timing_t freq;
|
|
|
|
|
|
/* This function is defined in the thread library. */
|
|
extern void __pthread_clock_settime (clockid_t clock_id, hp_timing_t offset)
|
|
__attribute__ ((__weak__));
|
|
|
|
|
|
static int
|
|
hp_timing_settime (clockid_t clock_id, const struct timespec *tp)
|
|
{
|
|
hp_timing_t tsc;
|
|
hp_timing_t usertime;
|
|
|
|
/* First thing is to get the current time. */
|
|
HP_TIMING_NOW (tsc);
|
|
|
|
if (__glibc_unlikely (freq == 0))
|
|
{
|
|
/* This can only happen if we haven't initialized the `freq'
|
|
variable yet. Do this now. We don't have to protect this
|
|
code against multiple execution since all of them should lead
|
|
to the same result. */
|
|
freq = __get_clockfreq ();
|
|
if (__glibc_unlikely (freq == 0))
|
|
/* Something went wrong. */
|
|
return -1;
|
|
}
|
|
|
|
/* Convert the user-provided time into CPU ticks. */
|
|
usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull;
|
|
|
|
/* Determine the offset and use it as the new base value. */
|
|
if (clock_id == CLOCK_PROCESS_CPUTIME_ID
|
|
|| __pthread_clock_settime == NULL)
|
|
GL(dl_cpuclock_offset) = tsc - usertime;
|
|
else
|
|
__pthread_clock_settime (clock_id, tsc - usertime);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Set CLOCK to value TP. */
|
|
int
|
|
__clock_settime (clockid_t clock_id, const struct timespec *tp)
|
|
{
|
|
int retval;
|
|
|
|
/* Make sure the time cvalue is OK. */
|
|
if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
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:
|
|
HANDLE_REALTIME;
|
|
break;
|
|
#endif
|
|
|
|
default:
|
|
#ifdef SYSDEP_SETTIME_CPU
|
|
SYSDEP_SETTIME_CPU;
|
|
#endif
|
|
#ifndef HANDLED_CPUTIME
|
|
# if HP_TIMING_AVAIL
|
|
if (CPUCLOCK_WHICH (clock_id) == CLOCK_PROCESS_CPUTIME_ID
|
|
|| CPUCLOCK_WHICH (clock_id) == CLOCK_THREAD_CPUTIME_ID)
|
|
retval = hp_timing_settime (clock_id, tp);
|
|
else
|
|
# endif
|
|
{
|
|
__set_errno (EINVAL);
|
|
retval = -1;
|
|
}
|
|
#endif
|
|
break;
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
weak_alias (__clock_settime, clock_settime)
|