summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/time.rst9
-rw-r--r--Modules/timemodule.c3
2 files changed, 12 insertions, 0 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 581b68a..f87fa64 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -159,6 +159,15 @@ The module defines the following functions and data items:
.. versionadded:: 3.3
+.. data:: CLOCK_HIGHRES
+
+ The Solaris OS has a CLOCK_HIGHRES timer that attempts to use an optimal
+ hardware source, and may give close to nanosecond resolution. CLOCK_HIGHRES
+ is the nonadjustable, high-resolution clock.
+
+ .. versionadded:: 3.3
+
+
.. data:: CLOCK_MONOTONIC
Clock that cannot be set and represents monotonic time since some
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index f44e0c4..0fe1b17 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -962,6 +962,9 @@ PyInit_timezone(PyObject *m) {
#ifdef CLOCK_MONOTONIC_RAW
PyModule_AddIntMacro(m, CLOCK_MONOTONIC_RAW);
#endif
+#ifdef CLOCK_HIGHRES
+ PyModule_AddIntMacro(m, CLOCK_HIGHRES);
+#endif
#ifdef CLOCK_PROCESS_CPUTIME_ID
PyModule_AddIntMacro(m, CLOCK_PROCESS_CPUTIME_ID);
#endif