From 90fbff548dae77d28847fc815b846473c5f3c46d Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 19 Nov 2018 23:57:24 +0100
Subject: [PATCH] net/haproxy: add support for multithreading

---
 .../mvc/app/controllers/OPNsense/HAProxy/forms/main.xml    | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml   | 7 +++++++
 .../service/templates/OPNsense/HAProxy/haproxy.conf        | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
index 417f1e51b..48eb6193c 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
@@ -97,6 +97,12 @@
                 <help><![CDATA[Number of HAProxy processes to start.<br/><div class="text-info"><b>NOTE:</b> You may experience random issues in multi-process mode. For more information about the "nbproc" option please see the HAProxy Documentation.</div>]]></help>
                 <advanced>true</advanced>
             </field>
+            <field>
+                <id>haproxy.general.tuning.nbthread</id>
+                <label>HAProxy threads</label>
+                <type>text</type>
+                <help><![CDATA[Number of threads to create for each HAProxy process.]]></help>
+            </field>
             <field>
                 <id>haproxy.general.tuning.maxConnections</id>
                 <label>Maximum connections</label>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index a26528457..de0c9093a 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -69,6 +69,13 @@
                     <ValidationMessage>Please specify a value between 1 and 128.</ValidationMessage>
                     <Required>Y</Required>
                 </nbproc>
+                <nbthread type="IntegerField">
+                    <default>1</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>1024</MaximumValue>
+                    <ValidationMessage>Please specify a value between 1 and 1024.</ValidationMessage>
+                    <Required>N</Required>
+                </nbthread>
                 <sslServerVerify type="OptionField">
                     <Required>Y</Required>
                     <default>ignore</default>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index 8ce355b88..7029e93cd 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -758,6 +758,9 @@ global
     stats                       socket /var/run/haproxy.socket level admin
 {% endif %}
     nbproc                      {{OPNsense.HAProxy.general.tuning.nbproc}}
+{% if OPNsense.HAProxy.general.tuning.nbthread|default('') != '' %}
+    nbthread                    {{OPNsense.HAProxy.general.tuning.nbthread}}
+{% endif %}
 {% if helpers.exists('OPNsense.HAProxy.cpus.cpu') %}
 {%   for cpu_map in helpers.toList('OPNsense.HAProxy.cpus.cpu') %}
 {%     if cpu_map.enabled == '1' %}