INN commit: trunk (5 files)

[INN Commit]

    Date: Tuesday, July 14, 2015 @ 09:48:11
  Author: iulius
Revision: 9923

Improve a few default values for innfeed.conf

- Increase max-queue-size from 5 to 20.

- Enable use-mmap by default.

Modified:
  trunk/doc/pod/innfeed.conf.pod
  trunk/doc/pod/news.pod
  trunk/innfeed/innfeed.h
  trunk/innfeed/main.c
  trunk/samples/innfeed.conf

--------------------------+
 doc/pod/innfeed.conf.pod |   18 ++++++++++--------
 doc/pod/news.pod         |    5 +++++
 innfeed/innfeed.h        |    2 +-
 innfeed/main.c           |    2 +-
 samples/innfeed.conf     |    4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

Modified: doc/pod/innfeed.conf.pod
===================================================================
--- doc/pod/innfeed.conf.pod	2015-07-14 16:43:55 UTC (rev 9922)
+++ doc/pod/innfeed.conf.pod	2015-07-14 16:48:11 UTC (rev 9923)
@@ -173,13 +173,15 @@
 
 =item I<use-mmap>
 
-This key requires a boolean value.  It specifies whether mmaping should be
-used if B<innfeed> has been built with mmap(2) support.  If article data
-on disk is not in NNTP-ready format (CR/LF at the end of each line), then
-after mmaping, the article is read into memory and fixed up, so mmaping
-has no positive effect (and possibly some negative effect depending on
-your system), and so in such a case this value should be C<false>, which
-is the default value.  This corresponds to the B<-M> command-line option.
+This key requires a boolean value and defaults to true.  When B<innfeed>
+is given file names to send (a fairly rare use case) instead of storage
+API tokens, it specifies whether mmaping should be used if B<innfeed>
+has been built with mmap(2) support.  If article data on disk is not in
+NNTP-ready format (CR/LF at the end of each line), then after mmaping,
+the article is read into memory and fixed up, so mmaping has no positive
+effect (and possibly some negative effect depending on your system),
+and so in such a case this value should be C<false>, which corresponds
+to the B<-M> command-line option.
 
 =item I<log-file>
 
@@ -495,7 +497,7 @@
 
 =item I<max-queue-size>
 
-This key requires a positive integer value.  The default value is C<5>.
+This key requires a positive integer value.  The default value is C<20>.
 It defines the maximum number of articles to process at one time when using
 streaming to transmit to a peer.  Larger numbers mean more memory consumed as
 articles usually get pulled into memory (see the description of I<use-mmap>).

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2015-07-14 16:43:55 UTC (rev 9922)
+++ doc/pod/news.pod	2015-07-14 16:48:11 UTC (rev 9923)
@@ -98,6 +98,11 @@
 enabled by default:  logstatus and nnrpdoverstats parameters, with a
 frequency of 10 minutes (status and timer parameters).
 
+=item *
+
+The default value of max-queue-size has changed from 5 to 20, and
+use-mmap now defaults to true for F<innfeed.conf>.
+
 =back
 
 If you are upgrading from a version prior to S<INN 2.5>, see also

Modified: innfeed/innfeed.h
===================================================================
--- innfeed/innfeed.h	2015-07-14 16:43:55 UTC (rev 9922)
+++ innfeed/innfeed.h	2015-07-14 16:48:11 UTC (rev 9923)
@@ -57,7 +57,7 @@
 #define RESPTOUT	 	300 		/* response-timeout */
 #define INIT_CXNS		1 		/* initial-connections */
 #define MAX_CXNS		2 		/* max-connections */
-#define MAX_Q_SIZE		5 		/* max-queue-size */
+#define MAX_Q_SIZE		20 		/* max-queue-size */
 #define STREAM			true 		/* streaming */
 #define NOCHECKHIGH 		95.0 		/* no-check-high */
 #define NOCHECKLOW 		90.0 		/* no-check-low */

Modified: innfeed/main.c
===================================================================
--- innfeed/main.c	2015-07-14 16:43:55 UTC (rev 9922)
+++ innfeed/main.c	2015-07-14 16:48:11 UTC (rev 9923)
@@ -56,7 +56,7 @@
 char *configFile = NULL ;
 bool RollInputFile = false ;
 char *pidFile = NULL ;
-bool useMMap = false ; /* Even if HAVE_MMAP.  Only used when innfeed is given
+bool useMMap = true ;  /* Even if !HAVE_MMAP.  Only used when innfeed is given
                         * file names to send instead of storage API tokens,
                         * which is a fairly rare use case. */
 void (*gPrintInfo) (void) ;

Modified: samples/innfeed.conf
===================================================================
--- samples/innfeed.conf	2015-07-14 16:43:55 UTC (rev 9922)
+++ samples/innfeed.conf	2015-07-14 16:48:11 UTC (rev 9923)
@@ -28,7 +28,7 @@
 #debug-level:                    0
 #debug-shrinking:                false
 #fast-exit:                      false
-#use-mmap:                       false
+#use-mmap:                       true
 #log-file:                       innfeed.log            # Relative to <pathlog>.
 #stdio-fdmax:                    0
 #log-time-format:                "%a %b %d %H:%M:%S %Y"
@@ -69,7 +69,7 @@
 #response-timeout:               300
 #initial-connections:            1
 #max-connections:                2
-#max-queue-size:                 5
+#max-queue-size:                 20
 #streaming:                      true
 #no-check-high:                  95.0
 #no-check-low:                   90.0