mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source 
[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 5245b97e13)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Miss Islington (bot) 2023-10-02 18:36:55 -07:00 • committed by GitHub
parent 981696e342
commit bf6843e91f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Doc/library/os.rst
View file

@ -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

1
Lib/test/test_posix.py
View file

@ -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()