vyos.util: migrate all cpu_count() occurances to common get_half_cpus()

4 files changed, 8 insertions, 31 deletions

diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index 94eb675f7..066e997f6 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -23,7 +23,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.template import render
-from vyos.util import call
+from vyos.util import call, get_half_cpus()
 from vyos.validate import is_ipv4
 from vyos import ConfigError
 
@@ -78,7 +78,7 @@ default_config_data = {
     'radius_dynamic_author': '',
     'sesscrtl': 'replace',
     'snmp': False,
-    'thread_cnt': '1'
+    'thread_cnt': get_half_cpus()
 }
 
 def get_config():
@@ -90,10 +90,6 @@ def get_config():
     conf.set_level(base_path)
     pppoe = deepcopy(default_config_data)
 
-    cpu = os.cpu_count()
-    if cpu > 1:
-        pppoe['thread_cnt'] = int(cpu/2)
-
     # general options
     if conf.exists(['access-concentrator']):
         pppoe['concentrator'] = conf.return_value(['access-concentrator'])
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index a640e2a94..d8a1fb115 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -25,7 +25,7 @@ from time import sleep
 from ipaddress import ip_network
 
 from vyos.config import Config
-from vyos.util import call
+from vyos.util import call, get_half_cpus
 from vyos.validate import is_ipv4
 from vyos import ConfigError
 from vyos.template import render
@@ -65,7 +65,7 @@ default_config_data = {
     'radius_dynamic_author': '',
     'wins': [],
     'ip6_column': [],
-    'thread_cnt': 1
+    'thread_cnt': get_half_cpus()
 }
 
 def get_config():
@@ -77,10 +77,6 @@ def get_config():
     conf.set_level(base_path)
     l2tp = deepcopy(default_config_data)
 
-    cpu = os.cpu_count()
-    if cpu > 1:
-        l2tp['thread_cnt'] = int(cpu/2)
-
     ### general options ###
     if conf.exists(['name-server']):
         for name_server in conf.return_values(['name-server']):
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index 15b80f984..8108a9670 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -23,7 +23,7 @@ from time import sleep
 
 from vyos.config import Config
 from vyos import ConfigError
-from vyos.util import run
+from vyos.util import run, get_half_cpus
 from vyos.template import render
 
 
@@ -79,6 +79,7 @@ def get_config():
         'wins': [],
         'client_ip_pool': '',
         'mtu': '1436',
+        'thread_cnt': get_half_cpus()
     }
 
     ### general options ###
@@ -206,18 +207,6 @@ def generate(c):
     if c == None:
         return None
 
-    # accel-cmd reload doesn't work so any change results in a restart of the daemon
-    try:
-        if os.cpu_count() == 1:
-            c['thread_cnt'] = 1
-        else:
-            c['thread_cnt'] = int(os.cpu_count()/2)
-    except KeyError:
-        if os.cpu_count() == 1:
-            c['thread_cnt'] = 1
-        else:
-            c['thread_cnt'] = int(os.cpu_count()/2)
-
     render(pptp_conf, 'pptp/pptp.config.tmpl', c, trim_blocks=True)
 
     if c['authentication']['local-users']:
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 9ec352290..90b4f1f34 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -23,7 +23,7 @@ from stat import S_IRUSR, S_IWUSR, S_IRGRP
 
 from vyos.config import Config
 from vyos import ConfigError
-from vyos.util import call, run
+from vyos.util import call, run, get_half_cpus
 from vyos.template import render
 
 
@@ -56,7 +56,7 @@ default_config_data = {
     'ppp_echo_failure' : '',
     'ppp_echo_interval' : '',
     'ppp_echo_timeout' : '',
-    'thread_cnt' : 1
+    'thread_cnt' : get_half_cpus()
 }
 
 def get_config():
@@ -68,10 +68,6 @@ def get_config():
 
     conf.set_level(base_path)
 
-    cpu = os.cpu_count()
-    if cpu > 1:
-        sstp['thread_cnt'] = int(cpu/2)
-
     if conf.exists(['authentication', 'mode']):
         sstp['auth_mode'] = conf.return_value(['authentication', 'mode'])