r2558 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-03-07 12:04:51 +0100 (Fri, 07 Mar 2008)
New Revision: 2558

Modified:
   trunk/varnish-cache/bin/varnishd/shmlog.c
Log:
Attempt to mlock(2) SHMFILE in core.


Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2008-03-07 10:58:12 UTC (rev 2557)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2008-03-07 11:04:51 UTC (rev 2558)
@@ -347,6 +347,10 @@
 	    MAP_HASSEMAPHORE | MAP_NOSYNC | MAP_SHARED,
 	    heritage.vsl_fd, 0);
 	xxxassert(loghead != MAP_FAILED);
+	i = mlock(loghead, heritage.vsl_size);
+	if (i != 0)
+		fprintf(stderr, "Notice: locking SHMFILE in core failed: %s\n",
+		    strerror(errno));
 	VSL_stats = &loghead->stats;
 	pp = (void *)(loghead + 1);
 	*pp = *params;