Changeset 1256 for python/trunk

Timestamp:

Nov 15, 2017, 10:55:31 PM (8 years ago)

Author:

dmik

Message:

python: Support NUMBER_OF_PROCESSORS in multitasking.cpu_count() on OS/2.

NUMBER_OF_PROCESSORS is checked before sysconf('SC_NPROCESSORS_ONLN').
Needed for Mozilla's xpcshell test harness.

File:

• python/trunk/Lib/multiprocessing/__init__.py (modified) (1 diff)

python/trunk/Lib/multiprocessing/__init__.py

@@ -127 +127 @@
     else:
         try:
-            num = os.sysconf('SC_NPROCESSORS_ONLN')
+            num = 0
+            if os.name == 'os2':
+                try:
+                    num = int(os.environ['NUMBER_OF_PROCESSORS'])
+                except (ValueError, KeyError):
+                    num = 0
+            if num == 0:
+                num = os.sysconf('SC_NPROCESSORS_ONLN')
         except (ValueError, OSError, AttributeError):
             num = 0