r4795 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-05-17 10:11:43 +0200 (Mon, 17 May 2010)
New Revision: 4795

Modified:
   trunk/varnish-cache/bin/varnishd/common.h
   trunk/varnish-cache/bin/varnishd/mgt.h
   trunk/varnish-cache/bin/varnishd/mgt_shmem.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Move shm-related arg processing to mgt_shmem.c

Apply our naming system



Modified: trunk/varnish-cache/bin/varnishd/common.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/common.h	2010-05-17 07:36:03 UTC (rev 4794)
+++ trunk/varnish-cache/bin/varnishd/common.h	2010-05-17 08:11:43 UTC (rev 4795)
@@ -42,8 +42,6 @@
 void VSL_Panic(int *len, char **ptr);
 
 /* mgt_shmem.c */
-void VSL_MgtInit(const char *fn, unsigned size);
-void VSL_MgtPid(void);
 extern struct varnish_stats *VSL_stats;
 extern struct shmloghead *loghead;
 extern unsigned char *logstart;

Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h	2010-05-17 07:36:03 UTC (rev 4794)
+++ trunk/varnish-cache/bin/varnishd/mgt.h	2010-05-17 08:11:43 UTC (rev 4795)
@@ -68,6 +68,10 @@
 void MCF_DumpMdoc(void);
 #endif
 
+/* mgt_shmem.c */
+void mgt_SHM_Init(const char *fn, const char *arg);
+void mgt_SHM_Pid(void);
+
 /* mgt_vcc.c */
 void mgt_vcc_init(void);
 int mgt_vcc_default(const char *bflag, const char *f_arg, char *vcl, int Cflag);

Modified: trunk/varnish-cache/bin/varnishd/mgt_shmem.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_shmem.c	2010-05-17 07:36:03 UTC (rev 4794)
+++ trunk/varnish-cache/bin/varnishd/mgt_shmem.c	2010-05-17 08:11:43 UTC (rev 4795)
@@ -126,11 +126,24 @@
 }
 
 void
-VSL_MgtInit(const char *fn, unsigned size)
+mgt_SHM_Init(const char *fn, const char *l_arg)
 {
 	int i;
 	struct params *pp;
+	const char *arg_default = "80m";
+	const char *q;
+	uintmax_t size;
 
+	if (l_arg == NULL)
+		l_arg = arg_default;
+
+	q = str2bytes(l_arg, &size, 0);
+	if (q != NULL) {
+		fprintf(stderr,  "Parameter error:\n");
+		fprintf(stderr, "\t-l ...:  %s\n", q);
+		exit (1);
+	}
+
 	i = open(fn, O_RDWR, 0644);
 	if (i >= 0 && vsl_goodold(i)) {
 		fprintf(stderr, "Using old SHMFILE\n");
@@ -155,7 +168,7 @@
 }
 
 void
-VSL_MgtPid(void)
+mgt_SHM_Pid(void)
 {
 
 	loghead->master_pid = getpid();

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2010-05-17 07:36:03 UTC (rev 4794)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2010-05-17 08:11:43 UTC (rev 4795)
@@ -409,9 +409,7 @@
 	const char *b_arg = NULL;
 	const char *f_arg = NULL;
 	const char *i_arg = NULL;
-	const char *l_arg = "80m";
-	uintmax_t l_size;
-	const char *q;
+	const char *l_arg = NULL;	/* default in mgt_shmem.c */
 	const char *h_arg = "critbit";
 	const char *M_arg = NULL;
 	const char *n_arg = NULL;
@@ -604,13 +602,6 @@
 		usage();
 	}
 
-	q = str2bytes(l_arg, &l_size, 0);
-	if (q != NULL) {
-		fprintf(stderr, "Parameter error:\n");
-		fprintf(stderr, "\t-l ...:  %s\n", q);
-		exit (1);
-	}
-
 	/* XXX: we can have multiple CLI actions above, is this enough ? */
 	if (cli[0].result != CLIS_OK) {
 		fprintf(stderr, "Parameter errors:\n");
@@ -689,7 +680,7 @@
 
 	setup_hash(h_arg);
 
-	VSL_MgtInit(SHMLOG_FILENAME, l_size);
+	mgt_SHM_Init(SHMLOG_FILENAME, l_arg);
 
 	vsb_finish(vident);
 	AZ(vsb_overflowed(vident));
@@ -697,7 +688,7 @@
 	if (!d_flag && !F_flag)
 		AZ(varnish_daemon(1, 0));
 
-	VSL_MgtPid();
+	mgt_SHM_Pid();
 
 	if (pfh != NULL && vpf_write(pfh))
 		fprintf(stderr, "NOTE: Could not write PID file\n");