---------------------
PatchSet 11693 
Date: 2007/09/23 13:00:01
Author: adrian
Branch: HEAD
Tag: (none) 
Log:
Based on Tim Starling's work: add a unique sequence number per logfile line.

Members: 
	src/access_log.c:1.101->1.102 
	src/cf.data.pre:1.428->1.429 
	src/logfile.c:1.24->1.25 
	src/structs.h:1.526->1.527 

Index: squid/src/access_log.c
===================================================================
RCS file: /cvsroot/squid/squid/src/access_log.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- squid/src/access_log.c	18 Sep 2007 14:43:32 -0000	1.101
+++ squid/src/access_log.c	23 Sep 2007 13:00:01 -0000	1.102
@@ -1,6 +1,6 @@
 
 /*
- * $Id: access_log.c,v 1.101 2007/09/18 14:43:32 adrian Exp $
+ * $Id: access_log.c,v 1.102 2007/09/23 13:00:01 adrian Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -318,6 +318,8 @@
 
     LFT_EXT_LOG,
 
+    LFT_SEQUENCE_NUMBER,
+
     LFT_PERCENT			/* special string cases for escaped chars */
 } logformat_bcode_t;
 
@@ -414,6 +416,8 @@
 /*{ ">sb", LFT_REQUEST_SIZE_BODY }, */
 /*{ ">sB", LFT_REQUEST_SIZE_BODY_NO_TE }, */
 
+    {"sn", LFT_SEQUENCE_NUMBER},
+
     {"<st", LFT_REPLY_SIZE_TOTAL},
 /*{ "<sl", LFT_REPLY_SIZE_LINE }, * /   / * the reply line (protocol, code, text) */
 /*{ "<sh", LFT_REPLY_SIZE_HEADERS }, */
@@ -682,6 +686,11 @@
 	    quote = 1;
 	    break;
 
+	case LFT_SEQUENCE_NUMBER:
+	    outint = LOGFILE_SEQNO(logfile);
+	    doint = 1;
+	    break;
+
 	case LFT_PERCENT:
 	    out = "%";
 	    break;
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- squid/src/cf.data.pre	21 Sep 2007 14:41:28 -0000	1.428
+++ squid/src/cf.data.pre	23 Sep 2007 13:00:01 -0000	1.429
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.428 2007/09/21 14:41:28 hno Exp $
+# $Id: cf.data.pre,v 1.429 2007/09/23 13:00:01 adrian Exp $
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -2137,6 +2137,7 @@
 		<st	Reply size including HTTP headers
 		>st	Request size including HTTP headers
 		st	Request+Reply size including HTTP headers
+		sn	Unique sequence number per log line entry
 		%	a literal % character
 
 logformat squid  %ts.%03tu %6tr %>a %Ss/%03Hs %<st %rm %ru %un %Sh/%<A %mt
Index: squid/src/logfile.c
===================================================================
RCS file: /cvsroot/squid/squid/src/logfile.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- squid/src/logfile.c	19 Sep 2007 21:16:30 -0000	1.24
+++ squid/src/logfile.c	23 Sep 2007 13:00:01 -0000	1.25
@@ -1,5 +1,5 @@
 /*
- * $Id: logfile.c,v 1.24 2007/09/19 21:16:30 hno Exp $
+ * $Id: logfile.c,v 1.25 2007/09/23 13:00:01 adrian Exp $
  *
  * DEBUG: section 50    Log file handling
  * AUTHOR: Duane Wessels
@@ -73,6 +73,7 @@
 
     if (fatal_flag)
 	lf->flags.fatal = 1;
+    lf->sequence_number = 0;
     return lf;
 }
 
@@ -110,6 +111,7 @@
 logfileLineEnd(Logfile * lf)
 {
     lf->f_lineend(lf);
+    lf->sequence_number++;
 }
 
 void
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid/squid/src/structs.h,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- squid/src/structs.h	22 Sep 2007 16:01:31 -0000	1.526
+++ squid/src/structs.h	23 Sep 2007 13:00:01 -0000	1.527
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.526 2007/09/22 16:01:31 adrian Exp $
+ * $Id: structs.h,v 1.527 2007/09/23 13:00:01 adrian Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2470,6 +2470,7 @@
     } flags;
 
     void *data;
+    int sequence_number;
 
     LOGLINESTART *f_linestart;
     LOGWRITE *f_linewrite;