trackrdrd v0.1: Code cleanup, most unneeded varnishlog code removed

configure.ac

 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2011 Varnish Software AS])
-AC_INIT([trackrdrd], [master])
+AC_COPYRIGHT([Copyright (c) 2012 Otto Gmbh & Co KG])
+AC_INIT([trackrdrd], [0.1])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/trackrdrd.c)
 AM_CONFIG_HEADER(config.h)

src/parse.c

@@ -5,10 +5,6 @@
  * Use only with permission
  *
  * Author: Geoffrey Simmons <geoffrey.simmons@uplex.de>
- * Portions adopted from varnishlog.c from the Varnish project
- *	Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
- * 	Copyright (c) 2006 Verdens Gang AS
- * 	Copyright (c) 2006-2011 Varnish Software AS
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/trackrdrd.c

@@ -57,198 +57,13 @@
 #include "vsl.h"
 #include "varnishapi.h"
 
-
-static int	b_flag, c_flag;
-
-/* Ordering-----------------------------------------------------------*/
-
-static struct vsb	*ob[65536];
-static unsigned char	flg[65536];
-static enum VSL_tag_e   last[65536];
-static uint64_t       bitmap[65536];
-#define F_INVCL		(1 << 0)
-
-static void
-h_order_finish(int fd, const struct VSM_data *vd)
-{
-
-	AZ(VSB_finish(ob[fd]));
-	if (VSB_len(ob[fd]) > 1 && VSL_Matched(vd, bitmap[fd])) {
-		printf("%s", VSB_data(ob[fd]));
-	}
-	bitmap[fd] = 0;
-	VSB_clear(ob[fd]);
-}
-
-static void
-clean_order(const struct VSM_data *vd)
-{
-	unsigned u;
-
-	for (u = 0; u < 65536; u++) {
-		if (ob[u] == NULL)
-			continue;
-		AZ(VSB_finish(ob[u]));
-		if (VSB_len(ob[u]) > 1 && VSL_Matched(vd, bitmap[u])) {
-			printf("%s\n", VSB_data(ob[u]));
-		}
-		flg[u] = 0;
-		bitmap[u] = 0;
-		VSB_clear(ob[u]);
-	}
-}
-
-static int
-h_order(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
-    unsigned spec, const char *ptr, uint64_t bm)
-{
-	char type;
-
-	struct VSM_data *vd = priv;
-
-	/* XXX: Just ignore any fd not inside the bitmap */
-	if (fd >= sizeof bitmap / sizeof bitmap[0])
-		return (0);
-
-	bitmap[fd] |= bm;
-
-	type = (spec & VSL_S_CLIENT) ? 'c' :
-	    (spec & VSL_S_BACKEND) ? 'b' : '-';
-
-	if (!(spec & (VSL_S_CLIENT|VSL_S_BACKEND))) {
-		if (!b_flag && !c_flag)
-			(void)VSL_H_Print(stdout, tag, fd, len, spec, ptr, bm);
-		return (0);
-	}
-	if (ob[fd] == NULL) {
-		ob[fd] = VSB_new_auto();
-		assert(ob[fd] != NULL);
-	}
-	if ((tag == SLT_BackendOpen || tag == SLT_SessionOpen ||
-		(tag == SLT_ReqStart &&
-		    last[fd] != SLT_SessionOpen &&
-		    last[fd] != SLT_VCL_acl) ||
-		(tag == SLT_BackendXID &&
-		    last[fd] != SLT_BackendOpen)) &&
-	    VSB_len(ob[fd]) != 0) {
-		/*
-		 * This is the start of a new request, yet we haven't seen
-		 * the end of the previous one.  Spit it out anyway before
-		 * starting on the new one.
-		 */
-		if (last[fd] != SLT_SessionClose)
-			VSB_printf(ob[fd], "%5d %-12s %c %s\n",
-			    fd, "Interrupted", type, VSL_tags[tag]);
-		h_order_finish(fd, vd);
-	}
-
-	last[fd] = tag;
-
-	switch (tag) {
-	case SLT_VCL_call:
-		if (flg[fd] & F_INVCL)
-			VSB_cat(ob[fd], "\n");
-		else
-			flg[fd] |= F_INVCL;
-		VSB_printf(ob[fd], "%5d %-12s %c %.*s",
-		    fd, VSL_tags[tag], type, len, ptr);
-		return (0);
-	case SLT_VCL_trace:
-	case SLT_VCL_return:
-		if (flg[fd] & F_INVCL) {
-			VSB_cat(ob[fd], " ");
-			VSB_bcat(ob[fd], ptr, len);
-			return (0);
-		}
-		break;
-	default:
-		break;
-	}
-	if (flg[fd] & F_INVCL) {
-		VSB_cat(ob[fd], "\n");
-		flg[fd] &= ~F_INVCL;
-	}
-	VSB_printf(ob[fd], "%5d %-12s %c %.*s\n",
-	    fd, VSL_tags[tag], type, len, ptr);
-	switch (tag) {
-	case SLT_ReqEnd:
-	case SLT_BackendClose:
-	case SLT_BackendReuse:
-	case SLT_StatSess:
-		h_order_finish(fd, vd);
-		break;
-	default:
-		break;
-	}
-	return (0);
-}
+#define TRACK_TAGS "ReqStart,VCL_log,ReqEnd"
+#define TRACKLOG_PREFIX "track "
+#define TRACKLOG_PREFIX_LEN (sizeof(TRACKLOG_PREFIX)-1)
 
 /*--------------------------------------------------------------------*/
 
-static volatile sig_atomic_t reopen;
-
-static void
-sighup(int sig)
-{
-
-	(void)sig;
-	reopen = 1;
-}
-
 static int
-open_log(const char *w_arg, int a_flag)
-{
-	int fd, flags;
-
-	flags = (a_flag ? O_APPEND : O_TRUNC) | O_WRONLY | O_CREAT;
-#ifdef O_LARGEFILE
-	flags |= O_LARGEFILE;
-#endif
-	if (!strcmp(w_arg, "-"))
-		fd = STDOUT_FILENO;
-	else
-		fd = open(w_arg, flags, 0644);
-	if (fd < 0) {
-		perror(w_arg);
-		exit(1);
-	}
-	return (fd);
-}
-
-static void
-do_write(const struct VSM_data *vd, const char *w_arg, int a_flag)
-{
-	int fd, i, l;
-	uint32_t *p;
-
-	fd = open_log(w_arg, a_flag);
-	XXXAN(fd >= 0);
-	(void)signal(SIGHUP, sighup);
-	while (1) {
-		i = VSL_NextLog(vd, &p, NULL);
-		if (i < 0)
-			break;
-		if (i > 0) {
-			l = VSL_LEN(p);
-			i = write(fd, p, 8L + VSL_WORDS(l) * 4L);
-			if (i < 0) {
-				perror(w_arg);
-				exit(1);
-			}
-		}
-		if (reopen) {
-			AZ(close(fd));
-			fd = open_log(w_arg, a_flag);
-			XXXAN(fd >= 0);
-			reopen = 0;
-		}
-	}
-	exit(0);
-}
-
-/*--------------------------------------------------------------------*/
-
-int
 OSL_Track(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
           unsigned spec, const char *ptr, uint64_t bitmap)
 {
@@ -260,8 +75,12 @@ OSL_Track(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
     int datalen;
     char *data;
 
-    syslog(LOG_DEBUG, "%s: %.*s", VSL_tags[tag], len, ptr);
-
+    (void) bitmap;
+#if 1
+    (void) spec;
+    (void) priv;
+    (void) fd;
+#endif
 #if 0
     /* if spec != 'c', we may have errors reading from SHM */
     if (spec & VSL_S_CLIENT == 0)
@@ -304,8 +123,8 @@ OSL_Track(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
         err = Parse_VCL_Log(&ptr[TRACKLOG_PREFIX_LEN], len-TRACKLOG_PREFIX_LEN,
                             &xid, &data, &datalen);
         AZ(err);
-        syslog(LOG_DEBUG, "%s: XID=%d, datalen=%d, data=%.*s", VSL_tags[tag],
-               xid, datalen, datalen, data);
+        syslog(LOG_DEBUG, "%s: XID=%d, data=[%.*s]", VSL_tags[tag],
+               xid, datalen, data);
         
 #if 0
         /* assert((hash(XID) exists) && hash(XID).tid == fd
@@ -371,9 +190,8 @@ int
 main(int argc, char * const *argv)
 {
 	int c;
-	int a_flag = 0, D_flag = 0, O_flag = 0, u_flag = 0, m_flag = 0;
+	int D_flag = 0;
 	const char *P_arg = NULL;
-	const char *w_arg = NULL;
 	struct vpf_fh *pfh = NULL;
 	struct VSM_data *vd;
 
@@ -384,52 +202,25 @@ main(int argc, char * const *argv)
             LOG_USER);
         atexit(closelog);
 
-	while ((c = getopt(argc, argv, VSL_ARGS "aDP:uVw:oO")) != -1) {
+	while ((c = getopt(argc, argv, "DP:Vn:")) != -1) {
 		switch (c) {
-		case 'a':
-			a_flag = 1;
-			break;
-		case 'b':
-			b_flag = 1;
-			AN(VSL_Arg(vd, c, optarg));
-			break;
-		case 'c':
-			c_flag = 1;
-			AN(VSL_Arg(vd, c, optarg));
-			break;
 		case 'D':
-			D_flag = 1;
-			break;
-		case 'o': /* ignored for compatibility with older versions */
-			break;
-		case 'O':
-			O_flag = 1;
-			break;
+                    D_flag = 1;
+                    break;
 		case 'P':
-			P_arg = optarg;
-			break;
-		case 'u':
-			u_flag = 1;
-			break;
+                    P_arg = optarg;
+                    break;
 		case 'V':
-			VCS_Message("varnishlog");
-			exit(0);
-		case 'w':
-			w_arg = optarg;
-			break;
-		case 'm':
-			m_flag = 1;
-			/* FALLTHROUGH */
+                    printf(PACKAGE_STRING "\n");
+                    exit(0);
+                case 'n':
+                    if (VSL_Arg(vd, c, optarg) <= 0)
+                        exit(1);
 		default:
-			if (VSL_Arg(vd, c, optarg) > 0)
-				break;
-			usage();
+                    usage();
 		}
 	}
 
-	if (O_flag && m_flag)
-		usage();
-
 	if ((argc - optind) > 0)
 		usage();
 
@@ -451,12 +242,7 @@ main(int argc, char * const *argv)
 	if (pfh != NULL)
 		VPF_Write(pfh);
 
-	if (w_arg != NULL)
-		do_write(vd, w_arg, a_flag);
-
-	if (u_flag)
-		setbuf(stdout, NULL);
-
+        /* Only read the VSL tags relevant to tracking */
         if (VSL_Arg(vd, 'i', TRACK_TAGS) <= 0) {
             fprintf(stderr, "VSL_Arg(i)\n");
             exit(1);

src/trackrdrd.h

@@ -29,21 +29,8 @@
  *
  */
 
-#include <stdint.h>
-
-#include "vsl.h"
-
-#define TRACK_TAGS "ReqStart,VCL_log,ReqEnd"
-#define TRACKLOG_PREFIX "track "
-#define TRACKLOG_PREFIX_LEN (sizeof(TRACKLOG_PREFIX)-1)
-
 int Parse_XID(const char *str, int len, unsigned *xid);
 int Parse_ReqStart(const char *ptr, int len, unsigned *xid);
 int Parse_ReqEnd(const char *ptr, unsigned len, unsigned *xid);
 int Parse_VCL_Log(const char *ptr, int len, unsigned *xid,
     char **data, int *datalen);
-
-void OSL_Log(const char *ptr, unsigned len);
-int OSL_Track(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
-    unsigned spec, const char *ptr, uint64_t bitmap);
-