mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
bitkeeper revision 1.1059 (40ee955eIGZ9Xw5VHoV1rdIQidW4Ow)
Handle response messages in any order.
This commit is contained in:
mjw@wray-m-3.hpl.hp.com committed
1 parent
8a93d3beb0
commit
9d6887a61c
1 file changed
+13
-24
@@ -11,11 +11,6 @@ from messages import msgTypeName, printMsg
|
||||
|
||||
DEBUG = 0
|
||||
|
||||
class OutOfOrderError(RuntimeError):
|
||||
"""Error reported when a response message arrives out of order.
|
||||
"""
|
||||
pass
|
||||
|
||||
class Responder:
|
||||
"""Handler for a response to a message with a specified id.
|
||||
"""
|
||||
@@ -82,7 +77,7 @@ class CtrlMsgRcvr:
|
||||
self.dom = None
|
||||
self.channel = None
|
||||
self.idx = None
|
||||
self.responders = []
|
||||
self.responders = {}
|
||||
self.timeout = 10
|
||||
|
||||
def setTimeout(self, timeout):
|
||||
@@ -140,10 +135,7 @@ class CtrlMsgRcvr:
|
||||
def addResponder(self, mid, deferred):
|
||||
"""Add a responder for a message id.
|
||||
The I{deferred} is called with callback(msg) when a response
|
||||
with message id I{mid} arrives. Responses are expected
|
||||
to arrive in order of message id. When a response arrives,
|
||||
waiting responders for messages with lower id have errback
|
||||
called with an OutOfOrder error.
|
||||
with message id I{mid} arrives.
|
||||
|
||||
Responders have a timeout set and I{deferred} will error
|
||||
on expiry.
|
||||
@@ -155,10 +147,10 @@ class CtrlMsgRcvr:
|
||||
@return: responder
|
||||
@rtype: Responder
|
||||
"""
|
||||
resp = Responder(mid, deferred)
|
||||
self.responders[resp.mid] = resp
|
||||
if self.timeout > 0:
|
||||
deferred.setTimeout(self.timeout)
|
||||
resp = Responder(mid, deferred)
|
||||
self.responders.append(resp)
|
||||
return resp
|
||||
|
||||
def callResponders(self, msg):
|
||||
@@ -174,18 +166,15 @@ class CtrlMsgRcvr:
|
||||
hdr = msg.get_header()
|
||||
mid = hdr['id']
|
||||
handled = 0
|
||||
while self.responders:
|
||||
resp = self.responders[0]
|
||||
if resp.mid > mid:
|
||||
break
|
||||
self.responders.pop()
|
||||
if resp.mid < mid:
|
||||
print 'callResponders> Out of order:', resp.mid, mid
|
||||
resp.error(OutOfOrderError())
|
||||
else:
|
||||
handled = 1
|
||||
resp.responseReceived(msg)
|
||||
break
|
||||
resp = self.responders.get(mid)
|
||||
if resp:
|
||||
handled = 1
|
||||
resp.responseReceived(msg)
|
||||
del self.responders[mid]
|
||||
# Clean up called responders.
|
||||
for resp in self.responders.values():
|
||||
if resp.deferred.called:
|
||||
del self.responders[resp.mid]
|
||||
return handled
|
||||
|
||||
def lostChannel(self):
|
||||
|
||||