---------------------
PatchSet 2702 
Date: 2001/08/02 10:52:41
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
remove helper excess debugging code

Members: 
	src/helper.c:1.1.1.3.12.35->1.1.1.3.12.36 

Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.1.1.3.12.35
retrieving revision 1.1.1.3.12.36
diff -u -r1.1.1.3.12.35 -r1.1.1.3.12.36
--- squid/src/helper.c	1 Aug 2001 14:31:54 -0000	1.1.1.3.12.35
+++ squid/src/helper.c	2 Aug 2001 10:52:41 -0000	1.1.1.3.12.36
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.c,v 1.1.1.3.12.35 2001/08/01 14:31:54 rbcollins Exp $
+ * $Id: helper.c,v 1.1.1.3.12.36 2001/08/02 10:52:41 rbcollins Exp $
  *
  * DEBUG: section 29    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -264,19 +264,19 @@
     cbdataLock(r->data);
     if ((buf != NULL) && lastserver) {
 	debug(29, 5) ("StatefulSubmit with lastserver %d\n", lastserver);
-    debug (29,1) ("Submit with deferred helper '%d' state '%d' deferred count '%d'\n", lastserver, lastserver->flags.reserved, lastserver->deferred_requests);
 	/* the queue doesn't count for this assert because queued requests
 	 * have already gone through here and been tested.
-	 * It's legal to have deferred_requests == 0 and queue entries and flags S_HELPEER_DEFERRED.
-	 * It's not legal to submit a new request w/lastserver in that state
+	 * It's legal to have deferred_requests == 0 and queue entries 
+	 * and status of S_HELPEER_DEFERRED.
+	 * BUT:  It's not legal to submit a new request w/lastserver in
+	 * that state.
 	 */
-        assert (!(lastserver->deferred_requests == 0 && lastserver->flags.reserved == S_HELPER_DEFERRED));
+        assert (!(lastserver->deferred_requests == 0 && 
+	      lastserver->flags.reserved == S_HELPER_DEFERRED));
 	if (lastserver->flags.reserved != S_HELPER_RESERVED) {
 	    lastserver->stats.submits++;
-	    assert (lastserver->deferred_requests);
 	    lastserver->deferred_requests--;
 	  }
-	assert (lastserver->deferred_requests >= 0); // <  4294967000);
 	if (!(lastserver->request)) {
 	    debug(29, 5) ("StatefulSubmit dispatching\n");
 	    helperStatefulDispatch(lastserver, r);
@@ -329,7 +329,6 @@
 	debug(29, 1) ("helperStatefulDefer: None available.\n");
 	return NULL;
     }
-    debug (29,1) ("Deferring helper '%d' state '%d' deferred count '%d'\n", rv, rv->flags.reserved, rv->deferred_requests);
     /* consistency check:
      * when the deferred count is 0,
      *   submits + releases == deferbyfunc + deferbycb
@@ -365,7 +364,6 @@
 	helperStatefulRequestFree(r);
 	srv->request = NULL;
     }
-    debug(29, 1) ("helperStatefulReset reset helper %s #%d\n", hlp->id_name, srv->index + 1);
     srv->flags.busy = 0;
     if (srv->queue.head) {
 	srv->flags.reserved = S_HELPER_DEFERRED;
@@ -382,7 +380,6 @@
 helperStatefulReleaseServer(helper_stateful_server * srv)
 /*decrease the number of 'waiting' clients that set the helper to be DEFERRED */
 {
-    debug (29,1) ("Release helper '%d' state '%d' deferred count '%d'\n", srv, srv->flags.reserved, srv->deferred_requests);
     srv->stats.releases++;
     if (srv->flags.reserved == S_HELPER_DEFERRED) {
 	assert (srv->deferred_requests);
@@ -802,8 +799,6 @@
 		/* the helper is still needed, but can
 		 * be used for other requests in the meantime.
 		 */
-	    debug (29,1) ("RV of DEFER from Read callback helper '%d' state '%d' deferred count '%d'\n", srv, srv->flags.reserved, srv->deferred_requests);
-		    
 		srv->flags.reserved = S_HELPER_DEFERRED;
 		srv->deferred_requests++;
 		srv->stats.deferbycb++;