summaryrefslogtreecommitdiff
path: root/Doc/library/multiprocessing.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-03-31 08:25:59 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-03-31 08:25:59 +0000
commitc7388039848c599e930620c8f544f18b1ae7187d (patch)
tree0569f16bc4d086576e4a845bb14792916a400801 /Doc/library/multiprocessing.rst
parent750bbb301975bc327fe5f4fcdf0cc9e1953a56d5 (diff)
parent3d50f38849cb50ac6366dd38c93d21631e4fc844 (diff)
downloadcpython-c7388039848c599e930620c8f544f18b1ae7187d.tar.gz
Issue #22854: Merge UnsupportedOperation fixes from 3.5
Diffstat (limited to 'Doc/library/multiprocessing.rst')
-rw-r--r--Doc/library/multiprocessing.rst9
1 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 684a59f086..6440f5c988 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -883,8 +883,13 @@ Miscellaneous
.. function:: cpu_count()
- Return the number of CPUs in the system. May raise
- :exc:`NotImplementedError`.
+ Return the number of CPUs in the system.
+
+ 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))``
+
+ May raise :exc:`NotImplementedError`.
.. seealso::
:func:`os.cpu_count`