[Glibc-bsd-commits] r6150 - in trunk/glibc-ports-2.25/kfreebsd: . bits
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Thu Aug 3 22:00:36 UTC 2017
Author: aurel32
Date: 2017-08-03 22:00:36 +0000 (Thu, 03 Aug 2017)
New Revision: 6150
Modified:
trunk/glibc-ports-2.25/kfreebsd/bits/resource.h
trunk/glibc-ports-2.25/kfreebsd/bits/time.h
trunk/glibc-ports-2.25/kfreebsd/prof-freq.c
Log:
Remove struct timeval from bits/time.h + cleanup
upstream commit 05b68e14b146586c46121730241142256f0ef850: Installed-header hygiene (BZ#20366): time.h types.
Modified: trunk/glibc-ports-2.25/kfreebsd/bits/resource.h
===================================================================
--- trunk/glibc-ports-2.25/kfreebsd/bits/resource.h 2017-08-03 21:57:55 UTC (rev 6149)
+++ trunk/glibc-ports-2.25/kfreebsd/bits/resource.h 2017-08-03 22:00:36 UTC (rev 6150)
@@ -157,8 +157,7 @@
#define RUSAGE_CHILDREN RUSAGE_CHILDREN
};
-#define __need_timeval
-#include <bits/time.h> /* For `struct timeval'. */
+#include <bits/types/struct_timeval.h>
/* Structure which says how much of each resource has been used. */
struct rusage
Modified: trunk/glibc-ports-2.25/kfreebsd/bits/time.h
===================================================================
--- trunk/glibc-ports-2.25/kfreebsd/bits/time.h 2017-08-03 21:57:55 UTC (rev 6149)
+++ trunk/glibc-ports-2.25/kfreebsd/bits/time.h 2017-08-03 22:00:36 UTC (rev 6150)
@@ -1,5 +1,5 @@
/* System-dependent timing definitions. FreeBSD version.
- Copyright (C) 1996-1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1996-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
@@ -13,64 +13,65 @@
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, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
/*
* Never include this file directly; use <time.h> instead.
*/
-#ifndef __need_timeval
-# ifndef _BITS_TIME_H
-# define _BITS_TIME_H 1
+#ifndef _BITS_TIME_H
+#define _BITS_TIME_H 1
-/* ISO/IEC 9899:1990 7.12.1: <time.h>
- The macro `CLOCKS_PER_SEC' is the number per second of the value
- returned by the `clock' function. */
+#include <bits/types.h>
+
+/* ISO/IEC 9899:1999 7.23.1: Components of time
+ The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
+ the number per second of the value returned by the `clock' function. */
/* CAE XSH, Issue 4, Version 2: <time.h>
The value of CLOCKS_PER_SEC is required to be 1 million on all
XSI-conformant systems. */
-# define CLOCKS_PER_SEC ((clock_t) 1000000l)
+#define CLOCKS_PER_SEC ((__clock_t) 1000000)
-# if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \
+#if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \
&& !defined __USE_XOPEN2K
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 128
-# endif
+extern long int __sysconf (int);
+# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */
+#endif
-# ifdef __USE_POSIX199309
+#ifdef __USE_POSIX199309
/* Identifier for system-wide realtime clock. */
-# define CLOCK_REALTIME 0
+# define CLOCK_REALTIME 0
/* Monotonic system-wide clock. */
-# define CLOCK_MONOTONIC 4
+# define CLOCK_MONOTONIC 4
/* These are BSD specific clocks. */
-# ifdef __USE_MISC
-# define CLOCK_VIRTUAL 1
-# define CLOCK_PROF 2
-# define CLOCK_UPTIME 5 /* FreeBSD-specific. */
-# define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */
-# define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */
-# define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */
-# define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */
-# define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */
-# define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */
-# define CLOCK_SECOND 13 /* FreeBSD-specific. */
-# endif
+# ifdef __USE_MISC
+# define CLOCK_VIRTUAL 1
+# define CLOCK_PROF 2
+# define CLOCK_UPTIME 5 /* FreeBSD-specific. */
+# define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */
+# define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */
+# define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */
+# define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */
+# define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */
+# define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */
+# define CLOCK_SECOND 13 /* FreeBSD-specific. */
+# endif
/* Thread-specific CPU-time clock. */
-# define CLOCK_THREAD_CPUTIME_ID 14
+# define CLOCK_THREAD_CPUTIME_ID 14
/* High-resolution timer from the CPU. */
-# define CLOCK_PROCESS_CPUTIME_ID 15
-# ifdef __USE_MISC
-# define CPUCLOCK_WHICH_PID 0
-# define CPUCLOCK_WHICH_TID 1
-# endif
+# define CLOCK_PROCESS_CPUTIME_ID 15
+# ifdef __USE_MISC
+# define CPUCLOCK_WHICH_PID 0
+# define CPUCLOCK_WHICH_TID 1
+# endif
/* Flag to indicate time is absolute. */
-# define TIMER_RELTIME 0 /* relative timer */
-# define TIMER_ABSTIME 1 /* absolute timer */
-# endif
+# define TIMER_RELTIME 0 /* relative timer */
+# define TIMER_ABSTIME 1 /* absolute timer */
+#endif
/* Getkerninfo clock information structure */
@@ -83,21 +84,4 @@
int profhz; /* profiling clock frequency */
};
-# endif /* bits/time.h */
-#endif
-
-#ifdef __need_timeval
-# undef __need_timeval
-# ifndef _STRUCT_TIMEVAL
-# define _STRUCT_TIMEVAL 1
-# include <bits/types.h>
-
-/* A time value that is accurate to the nearest
- microsecond but also has a range of years. */
-struct timeval
- {
- __time_t tv_sec; /* Seconds. */
- __suseconds_t tv_usec; /* Microseconds. */
- };
-# endif /* struct timeval */
-#endif /* need timeval */
+#endif /* bits/time.h */
Modified: trunk/glibc-ports-2.25/kfreebsd/prof-freq.c
===================================================================
--- trunk/glibc-ports-2.25/kfreebsd/prof-freq.c 2017-08-03 21:57:55 UTC (rev 6149)
+++ trunk/glibc-ports-2.25/kfreebsd/prof-freq.c 2017-08-03 22:00:36 UTC (rev 6150)
@@ -20,15 +20,6 @@
#include <stddef.h>
#include <sys/sysctl.h>
-struct clockinfo
-{
- int hz; /* Clock frequency. */
- int tick; /* Microseconds per hz tick, = 1000000 / hz. */
- int tickadj; /* Clock skew rate for adjtime(). */
- int stathz; /* Statistics clock frequency. */
- int profhz; /* Profiling clock frequency. */
-};
-
int
__profile_frequency (void)
{
More information about the Glibc-bsd-commits
mailing list