accept_loop.c
changeset 10 d07309450285
parent 2 8c88756f81b0
child 13 23a242d7b7fa
--- a/accept_loop.c	Wed Sep 28 09:04:16 2011 -0700
+++ b/accept_loop.c	Mon Oct 17 09:12:00 2011 -0700
@@ -31,7 +31,7 @@
 #include "volta.h"
 
 /*
- * Accept lines from squid and pass to the parser.
+ * Accept and process lines from squid.
  */
 int
 accept_loop( void )
@@ -47,7 +47,6 @@
 
 	debug( 1, LOC, "Waiting for input...\n" );
 	while ( fgets( buf, LINE_BUFSIZE, stdin ) != NULL ) {
-
 		bufsize = strlen( buf );
 
 		/* Common case, or last iteration of loop:
@@ -55,18 +54,17 @@
 		 */
 		if ( bufsize + 1 < LINE_BUFSIZE ) {
 			/* line wasn't concatenated onto in previous loops,
-			 * just pass it directly to parse() */
+			 * just pass it directly to process() */
 			if ( line == NULL ) {
-				parse( buf );
+				process( buf );
 			}
 
 			/* memory was previously allocated to contain the line, 
-			 * append the final chunk, pass to parse(), and cleanup. */
+			 * append the final chunk, pass to process(), and cleanup. */
 			else {
 				if ( (line = extend_line( line, buf )) == NULL ) continue;
-				parse( line );
-				free( line );
-				line = NULL;
+				process( line );
+				free( line ), line = NULL;
 			}
 		}
 
@@ -87,15 +85,15 @@
 			 * (within the current line) that still need to be appended.
 			 */
 			if ( buf[ bufsize - 1 ] == '\n' ) {
-				parse( line );
-				free( line );
-				line = NULL;
+				process( line );
+				free( line ), line = NULL;
 			}
 		}
 	}
 
 	/* stdin closed */
 	debug( 1, LOC, "End of stream\n" );
+	report_speed();
 	return( 0 );
 }