From: Jakub Kulík <Kulikjak@gmail.com>
Date: Wed, 4 Nov 2020 14:19:17 +0000 (+0100)
Subject: [3.8] bpo-35455: Fix thread_time for Solaris OS (GH-11118). (GH-23145)
X-Git-Tag: v3.8.7rc1~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a12f459ec2a31b96a21c735eb18f3d0fd19e99ff;p=thirdparty%2FPython%2Fcpython.git

[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@gmail.com>
---

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 000000000000..e72c7d277a11
--- /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 5e0010c8a819..096911dacfe5 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