From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 3 Oct 2023 01:36:55 +0000 (-0700)
Subject: [3.11] [3.12] gh-109649: Enhance os.cpu_count() documentation (GH-110169) (#110226)
X-Git-Tag: v3.11.7~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf6843e91f70a9956acb8a1cdd0564d3598b9a6e;p=thirdparty%2FPython%2Fcpython.git

[3.11] [3.12] gh-109649: Enhance os.cpu_count() documentation (GH-110169) (#110226)

[3.12] gh-109649: Enhance os.cpu_count() documentation (GH-110169)

* gh-109649: Enhance os.cpu_count() documentation

* Doc: Specify that os.cpu_count() counts *logicial* CPUs.
* Doc: Specify that os.sched_getaffinity(0) is related to the calling
  thread.
* Fix test_posix.test_sched_getaffinity(): restore the old CPU mask
  when the test completes!

* Restore removed text
(cherry picked from commit 5245b97e132ae071e2b574224e0788cab62fdcc9)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index df01963e54a5..087a01d2d9ef 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -4872,8 +4872,10 @@ operating system.
 
 .. function:: sched_getaffinity(pid, /)
 
-   Return the set of CPUs the process with PID *pid* (or the current process
-   if zero) is restricted to.
+   Return the set of CPUs the process with PID *pid* is restricted to.
+
+   If *pid* is zero, return the set of CPUs the calling thread of the current
+   process is restricted to.
 
 
 .. _os-path:
@@ -4914,12 +4916,12 @@ Miscellaneous System Information
 
 .. function:: cpu_count()
 
-   Return the number of CPUs in the system. Returns ``None`` if undetermined.
-
-   This number is not equivalent to the number of CPUs the current process can
-   use.  The number of usable CPUs can be obtained with
-   ``len(os.sched_getaffinity(0))``
+   Return the number of logical CPUs in the system. Returns ``None`` if
+   undetermined.
 
+   This number is not equivalent to the number of logical CPUs the current
+   process can use. ``len(os.sched_getaffinity(0))`` gets the number of logical
+   CPUs the calling thread of the current process is restricted to
 
    .. versionadded:: 3.4
 
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index e643d8e5a4ce..e4956b55a07e 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -1205,6 +1205,7 @@ class PosixTester(unittest.TestCase):
     @requires_sched_affinity
     def test_sched_setaffinity(self):
         mask = posix.sched_getaffinity(0)
+        self.addCleanup(posix.sched_setaffinity, 0, list(mask))
         if len(mask) > 1:
             # Empty masks are forbidden
             mask.pop()