Attachment #226294 for bug #256941




#include <sys/cdefs.h>
#include <sys/_null.h>
#include <sys/_types.h>
#include <sys/_clock_id.h>

#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE
/*

#endif
#endif

/* These macros are also in sys/time.h. */
#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506
#define CLOCK_REALTIME	0
#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506 */
#if !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE
#define CLOCK_VIRTUAL	1
#define CLOCK_PROF	2
#endif /* !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE */
#if !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112
#define CLOCK_MONOTONIC	4
#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. */
#define CLOCK_THREAD_CPUTIME_ID	14
#define	CLOCK_PROCESS_CPUTIME_ID	15
#endif /* !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112 */

#if __BSD_VISIBLE
#define TIMER_RELTIME	0x0	/* relative timer */
#endif
#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506
#define TIMER_ABSTIME	0x1	/* absolute timer */
#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506 */

struct tm {
	int	tm_sec;		/* seconds after the minute [0-60] */
	int	tm_min;		/* minutes after the hour [0-59] */




.\"
.\" $FreeBSD$
.\"
.Dd July 1, 2021
.Dt CLOCK_GETTIME 2
.Os
.Sh NAME

.It Dv CLOCK_REALTIME
.It Dv CLOCK_REALTIME_PRECISE
.It Dv CLOCK_REALTIME_FAST
.It Dv CLOCK_REALTIME_COARSE
Increments as a wall clock should.
.It Dv CLOCK_MONOTONIC
.It Dv CLOCK_MONOTONIC_PRECISE
.It Dv CLOCK_MONOTONIC_FAST
.It Dv CLOCK_MONOTONIC_COARSE
Increments in SI seconds.
.It Dv CLOCK_UPTIME
.It Dv CLOCK_UPTIME_PRECISE
.It Dv CLOCK_UPTIME_FAST
.It Dv CLOCK_BOOTTIME
Starts at zero when the kernel boots and increments
monotonically in SI seconds while the machine is running.
.It Dv CLOCK_VIRTUAL

.Fa CLOCK_UPTIME_PRECISE
are used to get the most exact value as possible, at the expense of
execution time.
The clock IDs
.Fa CLOCK_REALTIME_COARSE ,
.Fa CLOCK_MONOTONIC_COARSE
are aliases of corresponding IDs with _FAST suffix for compatibility with other
systems.
Finally,
.Dv CLOCK_BOOTTIME
is an alias for
.Dv CLOCK_UPTIME
for compatibility with other systems.
.Pp
The structure pointed to by
.Fa tp




/*-
 * SPDX-License-Identifier: BSD-3-Clause
 *
 * Copyright (c) 1989, 1993
 *	The Regents of the University of California.  All rights reserved.
 * (c) UNIX System Laboratories, Inc.
 * All or some portions of this file are derived from material licensed
 * to the University of California by American Telephone and Telegraph
 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
 * the permission of UNIX System Laboratories, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. Neither the name of the University nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
 *	@(#)time.h	8.3 (Berkeley) 1/21/94
 */

#ifndef _SYS_SYS__CLOCK_ID_H
#define	_SYS_SYS__CLOCK_ID_H

/*
 * These macros are shared between time.h and sys/time.h.
 */
#if __POSIX_VISIBLE >= 199506
#define CLOCK_REALTIME		0
#endif /* __POSIX_VISIBLE >= 199506 */
#ifdef __BSD_VISIBLE
#define CLOCK_VIRTUAL		1
#define CLOCK_PROF		2
#endif /* __BSD_VISIBLE */
#if __POSIX_VISIBLE >= 200112
#define CLOCK_MONOTONIC		4
#endif /* __POSIX_VISIBLE >= 200112 */
#ifdef __BSD_VISIBLE
/*
 * FreeBSD-specific clocks.
 */
#define CLOCK_UPTIME		5
#define CLOCK_UPTIME_PRECISE	7
#define CLOCK_UPTIME_FAST	8
#define CLOCK_REALTIME_PRECISE	9
#define CLOCK_REALTIME_FAST	10
#define CLOCK_MONOTONIC_PRECISE	11
#define CLOCK_MONOTONIC_FAST	12
#define CLOCK_SECOND		13
#endif /* __BSD_VISIBLE */

#if __POSIX_VISIBLE >= 200112
#define CLOCK_THREAD_CPUTIME_ID	14
#define	CLOCK_PROCESS_CPUTIME_ID 15
#endif /* __POSIX_VISIBLE >= 200112 */

/*
 * Linux compatible names.
 */
#if __BSD_VISIBLE
#define	CLOCK_BOOTTIME		CLOCK_UPTIME
#define	CLOCK_REALTIME_COARSE	CLOCK_REALTIME_FAST
#define	CLOCK_MONOTONIC_COARSE	CLOCK_MONOTONIC_FAST
#endif

#if __BSD_VISIBLE
#define TIMER_RELTIME	0x0	/* relative timer */
#endif
#if __POSIX_VISIBLE >= 199506
#define TIMER_ABSTIME	0x1	/* absolute timer */
#endif /* __POSIX_VISIBLE >= 199506 */

#endif /* _SYS_SYS__CLOCK_ID_H */




#include <sys/_timeval.h>
#include <sys/types.h>
#include <sys/timespec.h>
#include <sys/_clock_id.h>

struct timezone {
	int	tz_minuteswest;	/* minutes west of Greenwich */

	int	profhz;		/* profiling clock frequency */
};

/* These macros are also in time.h. */
#ifndef CLOCK_REALTIME
#define	CLOCK_REALTIME	0
#endif
#ifndef CLOCK_VIRTUAL
#define	CLOCK_VIRTUAL	1
#define	CLOCK_PROF	2
#endif
#ifndef CLOCK_MONOTONIC
#define	CLOCK_MONOTONIC	4
#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. */
#define	CLOCK_THREAD_CPUTIME_ID	14
#define	CLOCK_PROCESS_CPUTIME_ID	15
#endif

#ifndef TIMER_ABSTIME
#define	TIMER_RELTIME	0x0	/* relative timer */
#define	TIMER_ABSTIME	0x1	/* absolute timer */
#endif

#if __BSD_VISIBLE
#define	CPUCLOCK_WHICH_PID	0
#define	CPUCLOCK_WHICH_TID	1

Return to bug 256941

Lines 38-43 Link Here

(-)b/sys/sys/time.h (-27 / +1 lines)
38	#include <sys/_timeval.h>	38	#include <sys/_timeval.h>
39	#include <sys/types.h>	39	#include <sys/types.h>
40	#include <sys/timespec.h>	40	#include <sys/timespec.h>
		41	#include <sys/_clock_id.h>
41		42
42	struct timezone {	43	struct timezone {
43	int tz_minuteswest; /* minutes west of Greenwich */	44	int tz_minuteswest; /* minutes west of Greenwich */
Lines 471-503 struct clockinfo { Link Here
471	int profhz; /* profiling clock frequency */	472	int profhz; /* profiling clock frequency */
472	};	473	};
473		474
474	/* These macros are also in time.h. */
475	#ifndef CLOCK_REALTIME
476	#define CLOCK_REALTIME 0
477	#endif
478	#ifndef CLOCK_VIRTUAL
479	#define CLOCK_VIRTUAL 1
480	#define CLOCK_PROF 2
481	#endif
482	#ifndef CLOCK_MONOTONIC
483	#define CLOCK_MONOTONIC 4
484	#define CLOCK_UPTIME 5 /* FreeBSD-specific. */
485	#define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */
486	#define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */
487	#define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */
488	#define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */
489	#define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */
490	#define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */
491	#define CLOCK_SECOND 13 /* FreeBSD-specific. */
492	#define CLOCK_THREAD_CPUTIME_ID 14
493	#define CLOCK_PROCESS_CPUTIME_ID 15
494	#endif
495
496	#ifndef TIMER_ABSTIME
497	#define TIMER_RELTIME 0x0 /* relative timer */
498	#define TIMER_ABSTIME 0x1 /* absolute timer */
499	#endif
500
501	#if __BSD_VISIBLE	475	#if __BSD_VISIBLE
502	#define CPUCLOCK_WHICH_PID 0	476	#define CPUCLOCK_WHICH_PID 0
503	#define CPUCLOCK_WHICH_TID 1	477	#define CPUCLOCK_WHICH_TID 1

Lines 46-51 Link Here

(-)b/include/time.h (-29 / +1 lines)
46	#include <sys/cdefs.h>	46	#include <sys/cdefs.h>
47	#include <sys/_null.h>	47	#include <sys/_null.h>
48	#include <sys/_types.h>	48	#include <sys/_types.h>
		49	#include <sys/_clock_id.h>
49		50
50	#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 \|\| __BSD_VISIBLE	51	#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 \|\| __BSD_VISIBLE
51	/*	52	/*
Lines 97-131 typedef __pid_t pid_t; Link Here
97	#endif	98	#endif
98	#endif	99	#endif
99		100
100	/* These macros are also in sys/time.h. */
101	#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506
102	#define CLOCK_REALTIME 0
103	#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506 */
104	#if !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE
105	#define CLOCK_VIRTUAL 1
106	#define CLOCK_PROF 2
107	#endif /* !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE */
108	#if !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112
109	#define CLOCK_MONOTONIC 4
110	#define CLOCK_UPTIME 5 /* FreeBSD-specific. */
111	#define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */
112	#define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */
113	#define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */
114	#define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */
115	#define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */
116	#define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */
117	#define CLOCK_SECOND 13 /* FreeBSD-specific. */
118	#define CLOCK_THREAD_CPUTIME_ID 14
119	#define CLOCK_PROCESS_CPUTIME_ID 15
120	#endif /* !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112 */
121
122	#if __BSD_VISIBLE
123	#define TIMER_RELTIME 0x0 /* relative timer */
124	#endif
125	#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506
126	#define TIMER_ABSTIME 0x1 /* absolute timer */
127	#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506 */
128
129	struct tm {	101	struct tm {
130	int tm_sec; /* seconds after the minute [0-60] */	102	int tm_sec; /* seconds after the minute [0-60] */
131	int tm_min; /* minutes after the hour [0-59] */	103	int tm_min; /* minutes after the hour [0-59] */

Lines 29-35 Link Here

(-)b/lib/libc/sys/clock_gettime.2 (-1 / +14 lines)
29	.\"	29	.\"
30	.\" $FreeBSD$	30	.\" $FreeBSD$
31	.\"	31	.\"
32	.Dd May 13, 2021	32	.Dd July 1, 2021
33	.Dt CLOCK_GETTIME 2	33	.Dt CLOCK_GETTIME 2
34	.Os	34	.Os
35	.Sh NAME	35	.Sh NAME
Lines 68-81 as well as the following values: Link Here
68	.It Dv CLOCK_REALTIME	68	.It Dv CLOCK_REALTIME
69	.It Dv CLOCK_REALTIME_PRECISE	69	.It Dv CLOCK_REALTIME_PRECISE
70	.It Dv CLOCK_REALTIME_FAST	70	.It Dv CLOCK_REALTIME_FAST
		71	.It Dv CLOCK_REALTIME_COARSE
71	Increments as a wall clock should.	72	Increments as a wall clock should.
72	.It Dv CLOCK_MONOTONIC	73	.It Dv CLOCK_MONOTONIC
73	.It Dv CLOCK_MONOTONIC_PRECISE	74	.It Dv CLOCK_MONOTONIC_PRECISE
74	.It Dv CLOCK_MONOTONIC_FAST	75	.It Dv CLOCK_MONOTONIC_FAST
		76	.It Dv CLOCK_MONOTONIC_COARSE
75	Increments in SI seconds.	77	Increments in SI seconds.
76	.It Dv CLOCK_UPTIME	78	.It Dv CLOCK_UPTIME
77	.It Dv CLOCK_UPTIME_PRECISE	79	.It Dv CLOCK_UPTIME_PRECISE
78	.It Dv CLOCK_UPTIME_FAST	80	.It Dv CLOCK_UPTIME_FAST
		81	.It Dv CLOCK_BOOTTIME
79	Starts at zero when the kernel boots and increments	82	Starts at zero when the kernel boots and increments
80	monotonically in SI seconds while the machine is running.	83	monotonically in SI seconds while the machine is running.
81	.It Dv CLOCK_VIRTUAL	84	.It Dv CLOCK_VIRTUAL
Lines 104-109 Similarly, Link Here
104	.Fa CLOCK_UPTIME_PRECISE	107	.Fa CLOCK_UPTIME_PRECISE
105	are used to get the most exact value as possible, at the expense of	108	are used to get the most exact value as possible, at the expense of
106	execution time.	109	execution time.
		110	The clock IDs
		111	.Fa CLOCK_REALTIME_COARSE ,
		112	.Fa CLOCK_MONOTONIC_COARSE
		113	are aliases of corresponding IDs with _FAST suffix for compatibility with other
		114	systems.
		115	Finally,
		116	.Dv CLOCK_BOOTTIME
		117	is an alias for
		118	.Dv CLOCK_UPTIME
		119	for compatibility with other systems.
107	.Pp	120	.Pp
108	The structure pointed to by	121	The structure pointed to by
109	.Fa tp	122	.Fa tp

Added Link Here

(-)b/sys/sys/_clock_id.h (+90 lines)
1	/*-
2	* SPDX-License-Identifier: BSD-3-Clause
3	*
4	* Copyright (c) 1989, 1993
5	* The Regents of the University of California. All rights reserved.
6	* (c) UNIX System Laboratories, Inc.
7	* All or some portions of this file are derived from material licensed
8	* to the University of California by American Telephone and Telegraph
9	* Co. or Unix System Laboratories, Inc. and are reproduced herein with
10	* the permission of UNIX System Laboratories, Inc.
11	*
12	* Redistribution and use in source and binary forms, with or without
13	* modification, are permitted provided that the following conditions
14	* are met:
15	* 1. Redistributions of source code must retain the above copyright
16	* notice, this list of conditions and the following disclaimer.
17	* 2. Redistributions in binary form must reproduce the above copyright
18	* notice, this list of conditions and the following disclaimer in the
19	* documentation and/or other materials provided with the distribution.
20	* 3. Neither the name of the University nor the names of its contributors
21	* may be used to endorse or promote products derived from this software
22	* without specific prior written permission.
23	*
24	* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
25	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27	* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
28	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	* SUCH DAMAGE.
35	*
36	* @(#)time.h 8.3 (Berkeley) 1/21/94
37	*/
38
39	#ifndef _SYS_SYS__CLOCK_ID_H
40	#define _SYS_SYS__CLOCK_ID_H
41
42	/*
43	* These macros are shared between time.h and sys/time.h.
44	*/
45	#if __POSIX_VISIBLE >= 199506
46	#define CLOCK_REALTIME 0
47	#endif /* __POSIX_VISIBLE >= 199506 */
48	#ifdef __BSD_VISIBLE
49	#define CLOCK_VIRTUAL 1
50	#define CLOCK_PROF 2
51	#endif /* __BSD_VISIBLE */
52	#if __POSIX_VISIBLE >= 200112
53	#define CLOCK_MONOTONIC 4
54	#endif /* __POSIX_VISIBLE >= 200112 */
55	#ifdef __BSD_VISIBLE
56	/*
57	* FreeBSD-specific clocks.
58	*/
59	#define CLOCK_UPTIME 5
60	#define CLOCK_UPTIME_PRECISE 7
61	#define CLOCK_UPTIME_FAST 8
62	#define CLOCK_REALTIME_PRECISE 9
63	#define CLOCK_REALTIME_FAST 10
64	#define CLOCK_MONOTONIC_PRECISE 11
65	#define CLOCK_MONOTONIC_FAST 12
66	#define CLOCK_SECOND 13
67	#endif /* __BSD_VISIBLE */
68
69	#if __POSIX_VISIBLE >= 200112
70	#define CLOCK_THREAD_CPUTIME_ID 14
71	#define CLOCK_PROCESS_CPUTIME_ID 15
72	#endif /* __POSIX_VISIBLE >= 200112 */
73
74	/*
75	* Linux compatible names.
76	*/
77	#if __BSD_VISIBLE
78	#define CLOCK_BOOTTIME CLOCK_UPTIME
79	#define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST
80	#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST
81	#endif
82
83	#if __BSD_VISIBLE
84	#define TIMER_RELTIME 0x0 /* relative timer */
85	#endif
86	#if __POSIX_VISIBLE >= 199506
87	#define TIMER_ABSTIME 0x1 /* absolute timer */
88	#endif /* __POSIX_VISIBLE >= 199506 */
89
90	#endif /* _SYS_SYS__CLOCK_ID_H */