From: Ken Steele <ken@tilera.com>
Date: Wed, 9 Jul 2014 14:53:34 +0000 (-0400)
Subject: Update max-pending-packet comments to show it is now per-thread.
X-Git-Tag: suricata-2.1beta1~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1022%2Fhead;p=thirdparty%2Fsuricata.git

Update max-pending-packet comments to show it is now per-thread.

Updated suricata.yaml and comments in the code.
---

diff --git a/src/suricata.c b/src/suricata.c
index 1741dd4804..5ec53a4366 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -187,12 +187,12 @@ volatile sig_atomic_t sigterm_count = 0;
 
 /*
  * Flag to indicate if the engine is at the initialization
- * or already processing packets. 2 stages: SURICATA_INIT,
+ * or already processing packets. 3 stages: SURICATA_INIT,
  * SURICATA_RUNTIME and SURICATA_FINALIZE
  */
 SC_ATOMIC_DECLARE(unsigned int, engine_stage);
 
-/* Max packets processed simultaniously. */
+/* Max packets processed simultaniously per thread. */
 #define DEFAULT_MAX_PENDING_PACKETS 1024
 
 /** suricata engine control flags */
diff --git a/suricata.yaml.in b/suricata.yaml.in
index 65b7a50bf7..1d1d48e9eb 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -6,9 +6,9 @@
 # https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Suricatayaml
 
 
-# Number of packets allowed to be processed simultaneously.  Default is a
-# conservative 1024. A higher number will make sure CPU's/CPU cores will be
-# more easily kept busy, but may negatively impact caching.
+# Number of packets preallocated per thread. The default is 1024. A higher number 
+# will make sure each CPU will be more easily kept busy, but may negatively 
+# impact caching.
 #
 # If you are using the CUDA pattern matcher (mpm-algo: ac-cuda), different rules
 # apply. In that case try something like 60000 or more. This is because the CUDA