X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=e6ea8edfb1b81442e14a7f1adcf21a3269f7c9cc;hp=fcdc665224110a3ae1d27a43e6e4814e9b68852c;hb=697be73ae820a076f6803820038c830dec3c966d;hpb=02cdcb524f39817d80da3541d3143f698b666ebd

diff --git a/client b/client
index fcdc665..e6ea8ed 100755
--- a/client
+++ b/client
@@ -45,7 +45,10 @@ def process_cfg():
                     ('peer',  'server'),
                     ('rnets', 'routes')))
 
-outstanding = 0
+outstanding = { }
+
+def log_outstanding():
+  log_debug(DBG.CTRL_DUMP, 'OS %s' % outstanding)
 
 def start_client():
   global queue
@@ -58,14 +61,23 @@ def outbound(packet, saddr, daddr):
   queue.append(packet)
   check_outbound()
 
-class ResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self, req):
+class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
+  def __init__(self, req, desc):
     self._req = req
-    self._ssd = SlipStreamDecoder('req %s' % id(req), queue_inbound)
-    self._log(DBG.HTTP_CTRL, '__init__')
+    self._desc = desc
 
   def _log(self, dflag, msg, **kwargs):
-    log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
+    log_debug(dflag, '%s: %s' % (self._desc, msg), idof=self._req, **kwargs)
+
+  def connectionMade(self):
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
+
+class ResponseConsumer(GeneralResponseConsumer):
+  def __init__(self, req):
+    super().__init__(req, 'RC')
+    ssddesc = '[%s] %s' % (id(req), self._desc)
+    self._ssd = SlipStreamDecoder(ssddesc, queue_inbound)
+    self._log(DBG.HTTP_CTRL, '__init__')
 
   def dataReceived(self, data):
     self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
@@ -74,44 +86,35 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     except Exception as e:
       self._handleexception()
 
-  def connectionMade(self):
-    self._log(DBG.HTTP_CTRL, 'connectionMade')
-
   def connectionLost(self, reason):
     self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
     if not reason.check(twisted.web.client.ResponseDone):
-      self._asyncfailure(reason)
+      self.latefailure()
       return
     try:
       self._ssd.flush()
+      req_fin(req)
     except Exception as e:
       self._handleexception()
 
   def _handleexception(self):
-    self._asyncfailure(traceback.format_exc())
+    self._latefailure(traceback.format_exc())
 
-  def _asyncfailure(self, reason):
+  def _latefailure(self, reason):
     self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
     req_err(self._req, reason)
 
 class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
   def __init__(self, req, resp):
-    self._req = req
+    super().__init__(req, 'ERROR-RC')
     self._resp = resp
-
+    self._m = b''
     try:
       self._phrase = resp.phrase.decode('utf-8')
     except Exception:
       self._phrase = repr(resp.phrase)
-
     self._log(DBG.HTTP_CTRL, '__init__ %d %s' % (resp.code, self._phrase))
 
-  def _log(self, dflag, msg, **kwargs):
-    log_debug(dflag,'ERROR-RC '+msg, idof=self._req, **kwargs)
-
-  def connectionMade(self):
-    self._m = b''
-
   def dataReceived(self, data):
     self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data))
     self._m += data
@@ -137,26 +140,35 @@ def req_ok(req, resp):
     rc = ErrorResponseConsumer(req, resp)
 
   resp.deliverBody(rc)
+  # now rc is responsible for calling req_fin
 
 def req_err(req, err):
-  log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
-  if isinstance(err, twisted.python.failure.Failure):
-    err = err.getTraceback()
-  print(err, file=sys.stderr)
-  reactor.callLater(c.http_retry, (lambda: req_fin(req)))
+  # called when the Deferred fails, or (if it completes),
+  # later, by ResponsConsumer or ErrorResponsConsumer
+  try:
+    log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+    if isinstance(err, twisted.python.failure.Failure):
+      err = err.getTraceback()
+    print('[%#x] %s' % (id(req), err), file=sys.stderr)
+    if not isinstance(outstanding[req], int):
+      raise RuntimeError('[%#x] previously %s' % (id(req), outstanding[req]))
+    outstanding[req] = err
+    log_outstanding()
+    reactor.callLater(c.http_retry, (lambda: req_fin(req)))
+  except Exception as e:
+    crash(traceback.format_exc() + '\n----- handling -----\n' + err)
 
 def req_fin(req):
-  global outstanding
-  outstanding -= 1
-  log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % outstanding, idof=req)
+  del outstanding[req]
+  log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % len(outstanding), idof=req)
   check_outbound()
 
 def check_outbound():
   global outstanding
 
   while True:
-    if                          outstanding >= c.max_outstanding   : break
-    if not queue.nonempty() and outstanding >= c.target_outstanding: break
+    if                          len(outstanding) >= c.max_outstanding   : break
+    if not queue.nonempty() and len(outstanding) >= c.target_outstanding: break
 
     d = b''
     def moredata(s): nonlocal d; d += s
@@ -201,12 +213,14 @@ def check_outbound():
                         twisted.web.client.Headers(hh),
                         producer)
 
-    outstanding += 1
-    log_debug(DBG.HTTP_CTRL, 'request OS=%d' % outstanding, idof=req, d=d)
+    outstanding[req] = len(d)
+    log_debug(DBG.HTTP_CTRL, 'request OS=%d' % len(outstanding), idof=req, d=d)
     req.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))
     req.addErrback((lambda err: req_err(req, err)))
 
+  log_outstanding()
+
 common_startup()
 process_cfg()
 start_client()