r4891 - trunk/varnish-cache/lib/libvarnishapi

[phk at varnish-cache.org]

Author: phk
Date: 2010-06-05 10:57:14 +0200 (Sat, 05 Jun 2010)
New Revision: 4891

Added:
   trunk/varnish-cache/lib/libvarnishapi/vsl_stat.c
Modified:
   trunk/varnish-cache/lib/libvarnishapi/Makefile.am
   trunk/varnish-cache/lib/libvarnishapi/vsl.c
   trunk/varnish-cache/lib/libvarnishapi/vsl.h
Log:
Split stats to its own source file



Modified: trunk/varnish-cache/lib/libvarnishapi/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/Makefile.am	2010-06-05 08:48:34 UTC (rev 4890)
+++ trunk/varnish-cache/lib/libvarnishapi/Makefile.am	2010-06-05 08:57:14 UTC (rev 4891)
@@ -17,7 +17,8 @@
 	base64.c \
 	vsl.c \
 	vsl_arg.c \
-	vsl_log.c
+	vsl_log.c \
+	vsl_stat.c
 
 libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'

Modified: trunk/varnish-cache/lib/libvarnishapi/vsl.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/vsl.c	2010-06-05 08:48:34 UTC (rev 4890)
+++ trunk/varnish-cache/lib/libvarnishapi/vsl.c	2010-06-05 08:57:14 UTC (rev 4891)
@@ -197,7 +197,7 @@
 
 /*--------------------------------------------------------------------*/
 
-static struct shmalloc *
+struct shmalloc *
 vsl_find_alloc(const struct VSL_data *vd, const char *class, const char *type, const char *ident)
 {
 	struct shmalloc *sha;
@@ -237,21 +237,6 @@
 
 /*--------------------------------------------------------------------*/
 
-struct varnish_stats *
-VSL_OpenStats(struct VSL_data *vd)
-{
-	struct shmalloc *sha;
-
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	if (VSL_Open(vd))
-		return (NULL);
-	sha = vsl_find_alloc(vd, VSL_CLASS_STAT, "", "");
-	assert(sha != NULL);
-	return (SHA_PTR(sha));
-}
-
-/*--------------------------------------------------------------------*/
-
 int
 VSL_OpenLog(struct VSL_data *vd)
 {

Modified: trunk/varnish-cache/lib/libvarnishapi/vsl.h
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/vsl.h	2010-06-05 08:48:34 UTC (rev 4890)
+++ trunk/varnish-cache/lib/libvarnishapi/vsl.h	2010-06-05 08:57:14 UTC (rev 4891)
@@ -88,3 +88,6 @@
 	unsigned long		skip;
 	unsigned long		keep;
 };
+
+struct shmalloc *vsl_find_alloc(const struct VSL_data *vd, const char *class,
+    const char *type, const char *ident);

Added: trunk/varnish-cache/lib/libvarnishapi/vsl_stat.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/vsl_stat.c	                        (rev 0)
+++ trunk/varnish-cache/lib/libvarnishapi/vsl_stat.c	2010-06-05 08:57:14 UTC (rev 4891)
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2010 Redpill Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "svnid.h"
+SVNID("$Id$")
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "vas.h"
+#include "shmlog.h"
+#include "vre.h"
+#include "miniobj.h"
+#include "varnishapi.h"
+
+#include "vsl.h"
+
+/*--------------------------------------------------------------------*/
+
+struct varnish_stats *
+VSL_OpenStats(struct VSL_data *vd)
+{
+	struct shmalloc *sha;
+
+	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	if (VSL_Open(vd))
+		return (NULL);
+	sha = vsl_find_alloc(vd, VSL_CLASS_STAT, "", "");
+	assert(sha != NULL);
+	return (SHA_PTR(sha));
+}