From 2b4c0ce23d8c9c004d0d3e22a66309ab7658e5a5 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Tue, 27 Nov 2018 08:54:02 +0000
Subject: [PATCH] #2064: move get_cpu_count to os_util so we can re-use it

git-svn-id: https://xpra.org/svn/Xpra/trunk@21113 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/xpra/codecs/vpx/encoder.pyx | 14 ++------------
 src/xpra/os_util.py             | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/xpra/codecs/vpx/encoder.pyx b/src/xpra/codecs/vpx/encoder.pyx
index e8765e4ae2..a46c375938 100644
--- a/src/xpra/codecs/vpx/encoder.pyx
+++ b/src/xpra/codecs/vpx/encoder.pyx
@@ -14,7 +14,7 @@ from xpra.log import Logger
 log = Logger("encoder", "vpx")
 
 from xpra.codecs.codec_constants import video_spec
-from xpra.os_util import bytestostr, WIN32, OSX, POSIX
+from xpra.os_util import get_cpu_count, bytestostr, WIN32, OSX, POSIX
 from xpra.util import AtomicInteger, envint, envbool
 from xpra.buffers.membuf cimport object_as_buffer
 
@@ -24,17 +24,7 @@ from xpra.monotonic_time cimport monotonic_time
 
 SAVE_TO_FILE = os.environ.get("XPRA_SAVE_TO_FILE")
 
-#sensible default:
-cpus = 2
-try:
-    cpus = os.cpu_count()
-except:
-    try:
-        import multiprocessing
-        cpus = multiprocessing.cpu_count()
-    except:
-        pass
-cdef int VPX_THREADS = envint("XPRA_VPX_THREADS", max(1, cpus-1))
+cdef int VPX_THREADS = envint("XPRA_VPX_THREADS", max(1, get_cpu_count()-1))
 
 cdef inline int roundup(int n, int m):
     return (n + m - 1) & ~(m - 1)
diff --git a/src/xpra/os_util.py b/src/xpra/os_util.py
index 7106e35fad..fdc5b6bcdb 100644
--- a/src/xpra/os_util.py
+++ b/src/xpra/os_util.py
@@ -367,6 +367,21 @@ def get_generic_os_name():
             return v
     return sys.platform
 
+def get_cpu_count():
+    #sensible default:
+    cpus = 2
+    try:
+        try:
+            #python3:
+            cpus = os.cpu_count()
+        except AttributeError:
+            #python2:
+            import multiprocessing
+            cpus = multiprocessing.cpu_count()
+    except:
+        pass
+    return cpus
+
 
 def load_binary_file(filename):
     if not os.path.exists(filename):