From: Ian Jackson <ian@chiark.greenend.org.uk>
Date: Wed, 5 May 2010 23:41:03 +0000 (+0100)
Subject: fix so successful only connect really not blocker for another connect; lowvol in... 
X-Git-Tag: innduct-0.1~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=commitdiff_plain;h=87034f9481f8c7722d8958cf13acf1ad4bffc87f

fix so successful only connect really not blocker for another connect; lowvol in debug/dump
---

diff --git a/backends/innduct.c b/backends/innduct.c
index fb5ddca..c42771d 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1374,7 +1374,7 @@ static void connect_start(void) {
   assert(!connecting_fdpass_sock);
 
   info("starting connection attempt");
-  int ok_reconnect_delay_periods= reconnect_delay_periods;
+  int ok_until_connect= until_connect;
   reconnect_blocking_event();
 
   int socks[2];
@@ -1470,7 +1470,7 @@ static void connect_start(void) {
   on_fd_read_except(connecting_fdpass_sock, connchild_event);
 
   if (!conns.count)
-    reconnect_delay_periods= ok_reconnect_delay_periods;
+    until_connect= ok_until_connect;
 }
 
 /*---------- assigning articles to conns, and transmitting ----------*/
@@ -3311,11 +3311,11 @@ static void period(void) {
   debug("PERIOD"
 	" sms=%s[%d] conns=%d until_connect=%d"
 	" input_files main:%s flushing:%s backlog:%s[%d]"
-	" children connecting=%ld inndcomm=%ld"
+	" children connecting=%ld inndcomm=%ld lowvol_total=%d"
 	,
 	sms_names[sms], until_flush, conns.count, until_connect,
 	dipf_main, dipf_flushing, dipf_backlog, until_backlog_nextscan,
-	(long)connecting_child, (long)inndcomm_child
+	(long)connecting_child, (long)inndcomm_child, lowvol_total
 	);
 
   free(dipf_main);
@@ -3406,6 +3406,17 @@ CCMD(dump) {
   DUMPV("%d", , cli_master);
   fprintf(f,"\n");
 
+  fprintf(f,"lowvol ");
+  DUMPV("%d", , lowvol_circptr);
+  DUMPV("%d", , lowvol_total);
+  fprintf(f,":");
+  for (i=0; i<lowvol_periods; i++) {
+    fprintf(f," ");
+    if (i==lowvol_circptr) fprintf(f,"*");
+    fprintf(f,"%d",lowvol_perperiod[i]);
+  }
+  fprintf(f,"\n");
+
   fprintf(f,"filemon ");
   filemon_method_dump_info(f);