summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-08-15 17:42:05 +0100
committerGitHub <noreply@github.com>2017-08-15 17:42:05 +0100
commit963015005ec92f4f7670944287150e620f096e84 (patch)
tree5c6a455a53db8c5eb91c8b648d0eb92daf05098e /synapse/config/server.py
parentfix english (diff)
parentAllow configuration of CPU affinity (diff)
downloadsynapse-963015005ec92f4f7670944287150e620f096e84.tar.xz
Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinity
Allow configuration of CPU affinity
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 28b4e5f50c..4e4bf6b432 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -29,6 +29,7 @@ class ServerConfig(Config): self.user_agent_suffix = config.get("user_agent_suffix") self.use_frozen_dicts = config.get("use_frozen_dicts", False) self.public_baseurl = config.get("public_baseurl") + self.cpu_affinity = config.get("cpu_affinity") # Whether to send federation traffic out in this process. This only # applies to some federation traffic, and so shouldn't be used to @@ -147,6 +148,17 @@ class ServerConfig(Config): # When running as a daemon, the file to store the pid in pid_file: %(pid_file)s + # CPU affinity mask. Setting this restricts the CPUs on which the process + # will be scheduled. It is represented as a bitmask, with the lowest order + # bit corresponding to the first logical CPU and the highest order bit + # corresponding to the last logical CPU. Not all CPUs may exist on a + # given system but a mask may specify more CPUs than are present. + # For example: + # 0x00000001 is processor #0, + # 0x00000003 is processors #0 and #1, + # 0xFFFFFFFF is all processors (#0 through #31). + # cpu_affinity: 0xFFFFFFFF + # Whether to serve a web client from the HTTP/HTTPS root resource. web_client: True