def __init__(self):
self.shared = None
- self.lock = threading.Lock()
- self.sessions = []
threading.Thread.__init__(self)
self.daemon = True
self.request_queue = queue.Queue()
self.response_queue = queue.Queue()
+ self.internal_ids = {}
+ self.internal_id = 0
+ self.lock = threading.Lock()
- def add_session(self, session):
- with self.lock:
- self.sessions.append(session)
-
- def push_response(self, session, item):
- self.response_queue.put((session,item))
+ def push_response(self, item):
+ self.response_queue.put(item)
def pop_response(self):
return self.response_queue.get()
def pop_request(self):
return self.request_queue.get()
+ def get_session_id(self, internal_id):
+ with self.lock:
+ return session_ids.pop(internal_id)
+
+ def store_session_id(self, session, msgid):
+ with self.lock:
+ self.internal_ids[self.internal_id] = session, msgid
+ self.internal_id += 1
+
def run(self):
if self.shared is None:
raise TypeError("self.shared not set in Processor")
while not self.shared.stopped():
- # Deep copy entire sessions list and blank it
- # This is done to minimise lock contention
- with self.lock:
- sessions = self.sessions[:]
- self.sessions = []
- for session in sessions:
- if not session.stopped():
- # If session is still alive then re-add it back
- # to our internal register
- self.add_session(session)
-
session, request = self.pop_request()
- self.process(session, request)
+
+ method = request['method']
+ params = request.get('params',[])
+
+ if method in [ 'numblocks.subscribe', 'address.subscribe', 'server.peers']:
+ session.subscribe_to_service(method, params)
+
+ # store session and id locally
+ request['id'] = self.store_session_id(session, request['id'])
+ self.process(request)
self.stop()
def stop(self):
pass
- def process(self, session, request):
+ def process(self, request):
print "New request", request
# Do stuff...
# response = request
# When ready, you call
- # self.push_response(session,response)
+ # self.push_response(response)
+
+
class Session:
self.address = address
self._stopped = False
self.lock = threading.Lock()
- self.numblocks_sub = None
- self.addresses_sub = {}
+ self.subscriptions = []
+ print "new session", address
def stop(self):
self._connection.close()
else:
return self._connection
- def subscribe_to_numblocks(self,message_id):
+ def subscribe_to_service(self, method, params):
with self.lock:
- self.numblocks_sub = message_id
+ self.subscriptions.append((method, params))
- def subscribe_to_address(self,address,message_id,status):
- with self.lock:
- self.addresses_sub[address] = message_id,status
class TcpResponder(threading.Thread):
- def __init__(self, shared, processor):
+ def __init__(self, shared, processor, server):
self.shared = shared
self.processor = processor
+ self.server = server
threading.Thread.__init__(self)
+
def run(self):
while not self.shared.stopped():
- session,response = self.processor.pop_response()
- raw_response = json.dumps(response)
- # Possible race condition here by having session
- # close connection?
- # I assume Python connections are thread safe interfaces
- connection = session.connection()
+ response = self.processor.pop_response()
+
+ internal_id = response.get('id')
+ params = response.get('params',[])
try:
- connection.send(raw_response + "\n")
+ method = response['method']
except:
- session.stop()
+ print "no method", response
+ continue
+
+ if internal_id:
+ session, message_id = self.processor.get_session_id(internal_id)
+ if message_id:
+ response['id'] = message_id
+ self.send_response(response, session)
+
+ else:
+ for session in self.server.sessions:
+ if not session.stopped():
+ if (method,params) in session.subscriptions:
+ self.send_response(response, session)
+
+
+
+ def send_response(self, response, session):
+ raw_response = json.dumps(response)
+ # Possible race condition here by having session
+ # close connection?
+ # I assume Python connections are thread safe interfaces
+ try:
+ connection = session.connection()
+ connection.send(raw_response + "\n")
+ except:
+ session.stop()
class TcpClientRequestor(threading.Thread):
def run(self):
while not self.shared.stopped():
if not self.update():
- self.session.stop()
break
while self.parse():
try:
command = json.loads(raw_command)
except:
- self.processor.push_response(self.session,
- {"error": "bad JSON", "request": raw_command})
+ self.processor.push_response({"error": "bad JSON", "request": raw_command})
return True
try:
method = command['method']
except KeyError:
# Return an error JSON in response.
- self.processor.push_response(self.session,
- {"error": "syntax error", "request": raw_command})
+ self.processor.push_response({"error": "syntax error", "request": raw_command})
else:
self.processor.push_request(self.session,command)
def __init__(self, shared, processor, host, port):
self.shared = shared
self.processor = processor
- self.clients = []
+ self.sessions = []
threading.Thread.__init__(self)
self.daemon = True
self.host = host
self.port = port
+ self.lock = threading.Lock()
def run(self):
print "TCP server started."
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((self.host, self.port))
sock.listen(1)
- responder = TcpResponder(self.shared, self.processor)
+ responder = TcpResponder(self.shared, self.processor, self)
responder.start()
while not self.shared.stopped():
session = Session(*sock.accept())
client_req = TcpClientRequestor(self.shared, self.processor, session)
client_req.start()
- self.processor.add_session(session)
+ self.add_session(session)
+ self.collect_garbage()
+
+ def add_session(self, session):
+ with self.lock:
+ self.sessions.append(session)
+
+ def collect_garbage(self):
+ # Deep copy entire sessions list and blank it
+ # This is done to minimise lock contention
+ with self.lock:
+ sessions = self.sessions[:]
+ self.sessions = []
+ for session in sessions:
+ if not session.stopped():
+ # If session is still alive then re-add it back
+ # to our internal register
+ self.add_session(session)
+
class Shared: