summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-22 02:01:55 +0100
committerAmber Brown <hawkowl@atleastfornow.net>2019-06-22 11:01:55 +1000
commit6cda36777b91d28090c3be53f26f975a9b016d97 (patch)
tree43ccaa16efec1e3a8da78287b606b47b7bdfab91 /synapse/config/server.py
parentImprove help and cmdline option names for --generate-config options (#5512) (diff)
downloadsynapse-6cda36777b91d28090c3be53f26f975a9b016d97.tar.xz
Drop support for cpu_affinity (#5525)
This has no useful purpose on python3, and is generally a source of confusion.
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py24
1 files changed, 0 insertions, 24 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 6d3f1da96c..9ceca0a606 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -57,7 +57,6 @@ 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
@@ -336,29 +335,6 @@ class ServerConfig(Config):
         #
         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).
-        #
-        # Pinning a Python process to a single CPU is desirable, because Python
-        # is inherently single-threaded due to the GIL, and can suffer a
-        # 30-40%% slowdown due to cache blow-out and thread context switching
-        # if the scheduler happens to schedule the underlying threads across
-        # different cores. See
-        # https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/.
-        #
-        # This setting requires the affinity package to be installed!
-        #
-        #cpu_affinity: 0xFFFFFFFF
-
         # The path to the web client which will be served at /_matrix/client/
         # if 'webclient' is configured under the 'listeners' configuration.
         #