Skip to content

Commit

Permalink
bpo-31917: Add 3 new clock identifiers (python#4207)
Browse files Browse the repository at this point in the history
Add new clock identfiers:

* time.CLOCK_BOOTTIME
* time.CLOCK_PROF
* time.CLOCK_UPTIME
  • Loading branch information
vstinner authored Nov 2, 2017
1 parent e8b1965 commit a64ce97
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 0 deletions.
35 changes: 35 additions & 0 deletions Doc/library/time.rst
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,21 @@ Clock ID Constants
These constants are used as parameters for :func:`clock_getres` and
:func:`clock_gettime`.

.. data:: CLOCK_BOOTTIME

Identical to :data:`CLOCK_MONOTONIC`, except it also includes any time that
the system is suspended.

This allows applications to get a suspend-aware monotonic clock without
having to deal with the complications of :data:`CLOCK_REALTIME`, which may
have discontinuities if the time is changed using ``settimeofday()`` or
similar.

Availability: Linux 2.6.39 or later.

.. versionadded:: 3.7


.. data:: CLOCK_HIGHRES

The Solaris OS has a ``CLOCK_HIGHRES`` timer that attempts to use an optimal
Expand Down Expand Up @@ -703,6 +718,15 @@ These constants are used as parameters for :func:`clock_getres` and
.. versionadded:: 3.3


.. data:: CLOCK_PROF

High-resolution per-process timer from the CPU.

Availability: FreeBSD 3 or later, NetBSD 7 or later, OpenBSD.

.. versionadded:: 3.7


.. data:: CLOCK_THREAD_CPUTIME_ID

Thread-specific CPU-time clock.
Expand All @@ -712,6 +736,17 @@ These constants are used as parameters for :func:`clock_getres` and
.. versionadded:: 3.3


.. data:: CLOCK_UPTIME

Time whose absolute value is the time the system has been running and not
suspended, providing accurate uptime measurement, both absolute and
interval.

Availability: FreeBSD 7 or later, OpenBSD 5.5 or later.

.. versionadded:: 3.7


The following constant is the only parameter that can be sent to
:func:`clock_settime`.

Expand Down
14 changes: 14 additions & 0 deletions Doc/whatsnew/3.7.rst
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,20 @@ string
expression pattern for braced placeholders and non-braced placeholders
separately. (Contributed by Barry Warsaw in :issue:`1198569`.)

time
----

Add new clock identifiers:

* :data:`time.CLOCK_BOOTTIME` (Linux): Identical to
:data:`time.CLOCK_MONOTONIC`, except it also includes any time that the
system is suspended.
* :data:`time.CLOCK_PROF` (FreeBSD, NetBSD and OpenBSD): High-resolution
per-process timer from the CPU.
* :data:`time.CLOCK_UPTIME` (FreeBSD, OpenBSD): Time whose absolute value is
the time the system has been running and not suspended, providing accurate
uptime measurement, both absolute and interval.

unittest.mock
-------------

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add 3 new clock identifiers: :data:`time.CLOCK_BOOTTIME`,
:data:`time.CLOCK_PROF` and :data:`time.CLOCK_UPTIME`.
9 changes: 9 additions & 0 deletions Modules/timemodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1389,6 +1389,15 @@ PyInit_time(void)
#ifdef CLOCK_THREAD_CPUTIME_ID
PyModule_AddIntMacro(m, CLOCK_THREAD_CPUTIME_ID);
#endif
#ifdef CLOCK_PROF
PyModule_AddIntMacro(m, CLOCK_PROF);
#endif
#ifdef CLOCK_BOOTTIME
PyModule_AddIntMacro(m, CLOCK_BOOTTIME);
#endif
#ifdef CLOCK_UPTIME
PyModule_AddIntMacro(m, CLOCK_UPTIME);
#endif

if (!initialized) {
if (PyStructSequence_InitType2(&StructTimeType,
Expand Down

0 comments on commit a64ce97

Please sign in to comment.