summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2024-03-30 15:29:59 +0000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-03-31 00:38:09 +0000
commit92d44fb6aef675dfdc1e2433bbb7f9f6ff1b3abe (patch)
treec9f679fd3d51dbaa584ea7812bdaa4ae7c2c524b /python
parent495bf823b7c7d51ea1506445e80debbde4d69a78 (diff)
downloadvyos-1x-92d44fb6aef675dfdc1e2433bbb7f9f6ff1b3abe.tar.gz
vyos-1x-92d44fb6aef675dfdc1e2433bbb7f9f6ff1b3abe.zip
accel-ppp: T6187: use correct CPU counts adjusted for SMT
(cherry picked from commit 6927c0b622c8feaece907944bae3d4724f1e55a0)
Diffstat (limited to 'python')
-rw-r--r--python/vyos/configdict.py4
-rw-r--r--python/vyos/utils/system.py7
2 files changed, 2 insertions, 9 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 4111d7271..cb9f0cbb8 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -633,7 +633,7 @@ def get_accel_dict(config, base, chap_secrets, with_pki=False):
Return a dictionary with the necessary interface config keys.
"""
- from vyos.utils.system import get_half_cpus
+ from vyos.cpu import get_core_count
from vyos.template import is_ipv4
dict = config.get_config_dict(base, key_mangling=('-', '_'),
@@ -643,7 +643,7 @@ def get_accel_dict(config, base, chap_secrets, with_pki=False):
with_pki=with_pki)
# set CPUs cores to process requests
- dict.update({'thread_count' : get_half_cpus()})
+ dict.update({'thread_count' : get_core_count()})
# we need to store the path to the secrets file
dict.update({'chap_secrets_file' : chap_secrets})
diff --git a/python/vyos/utils/system.py b/python/vyos/utils/system.py
index 5d41c0c05..55813a5f7 100644
--- a/python/vyos/utils/system.py
+++ b/python/vyos/utils/system.py
@@ -79,13 +79,6 @@ def sysctl_apply(sysctl_dict: dict[str, str], revert: bool = True) -> bool:
# everything applied
return True
-def get_half_cpus():
- """ return 1/2 of the numbers of available CPUs """
- cpu = os.cpu_count()
- if cpu > 1:
- cpu /= 2
- return int(cpu)
-
def find_device_file(device):
""" Recurively search /dev for the given device file and return its full path.
If no device file was found 'None' is returned """