[Python-checkins] [3.8] bpo-35455: Fix thread_time for Solaris OS (GH-11118). (GH-23145)
pablogsal
webhook-mailer at python.org
Wed Nov 4 09:19:22 EST 2020
https://github.com/python/cpython/commit/a12f459ec2a31b96a21c735eb18f3d0fd19e99ff
commit: a12f459ec2a31b96a21c735eb18f3d0fd19e99ff
branch: 3.8
author: Jakub Kulík <Kulikjak at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2020-11-04T14:19:17Z
summary:
[3.8] bpo-35455: Fix thread_time for Solaris OS (GH-11118). (GH-23145)
(cherry picked from commit 9568622c9983b682b2a2a7bacfd3c341028ea099)
Co-authored-by: Jakub Kulík <Kulikjak at gmail.com>
files:
A Misc/NEWS.d/next/Library/2020-11-02-14-10-48.bpo-35455.Q1xTIo.rst
M Modules/timemodule.c
diff --git a/Misc/NEWS.d/next/Library/2020-11-02-14-10-48.bpo-35455.Q1xTIo.rst b/Misc/NEWS.d/next/Library/2020-11-02-14-10-48.bpo-35455.Q1xTIo.rst
new file mode 100644
index 0000000000000..e72c7d277a112
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-11-02-14-10-48.bpo-35455.Q1xTIo.rst
@@ -0,0 +1,3 @@
+On Solaris, :func:`~time.thread_time` is now implemented with
+``gethrvtime()`` because ``clock_gettime(CLOCK_THREAD_CPUTIME_ID)`` is not
+always available. Patch by Jakub Kulik.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 5e0010c8a8199..096911dacfe5a 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1344,6 +1344,23 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
return 0;
}
+#elif defined(__sun) && defined(__SVR4)
+#define HAVE_THREAD_TIME
+static int
+_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+{
+ /* bpo-35455: On Solaris, CLOCK_THREAD_CPUTIME_ID clock is not always
+ available; use gethrvtime() to substitute this functionality. */
+ if (info) {
+ info->implementation = "gethrvtime()";
+ info->resolution = 1e-9;
+ info->monotonic = 1;
+ info->adjustable = 0;
+ }
+ *tp = _PyTime_FromNanoseconds(gethrvtime());
+ return 0;
+}
+
#elif defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
#define HAVE_THREAD_TIME
static int
More information about the Python-checkins
mailing list