Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Use os.cpu_count()

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-16 18:47:36 +05:30
parent e574e47b71
commit 01326d69cf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/__init__.py
View File

@ -18,7 +18,7 @@ except EnvironmentError:
from calibre.constants import (iswindows, isosx, islinux, isfrozen, from calibre.constants import (iswindows, isosx, islinux, isfrozen,
isbsd, preferred_encoding, __appname__, __version__, __author__, isbsd, preferred_encoding, __appname__, __version__, __author__,
win32event, win32api, winerror, fcntl, win32event, win32api, winerror, fcntl, ispy3,
filesystem_encoding, plugins, config_dir) filesystem_encoding, plugins, config_dir)
from calibre.startup import winutil, winutilerror from calibre.startup import winutil, winutilerror
from calibre.utils.icu import safe_chr from calibre.utils.icu import safe_chr
@ -454,7 +454,14 @@ class CurrentDir(object):
_ncpus = None _ncpus = None
def detect_ncpus(): if ispy3:
def detect_ncpus():
global _ncpus
if _ncpus is None:
_ncpus = max(1, os.cpu_count() or 1)
return _ncpus
else:
def detect_ncpus():
"""Detects the number of effective CPUs in the system""" """Detects the number of effective CPUs in the system"""
global _ncpus global _ncpus
if _ncpus is None: if _ncpus is None: