X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=9210fd615f373416a52264fc81b567dd289cf781;hb=aa444a8b7c461ca2df014f015dc64c6226fd976e;hp=71b9d625ebbfe61dfe1d4704042b602976e4a2e3;hpb=ac6403ee0964644e1afe3f5df2daaf668a0ef261;p=electrum-server.git diff --git a/processor.py b/processor.py index 71b9d62..9210fd6 100644 --- a/processor.py +++ b/processor.py @@ -34,21 +34,21 @@ class Processor(threading.Thread): self.dispatcher = None self.queue = queue.Queue() - def process(self, request): + def process(self, session, request): pass - def add_request(self, request): - self.queue.put(request) + def add_request(self, session, request): + self.queue.put((session, request)) - def push_response(self, response): + def push_response(self, session, response): #print "response", response - self.dispatcher.request_dispatcher.push_response(response) + self.dispatcher.request_dispatcher.push_response(session, response) def run(self): while not self.shared.stopped(): - request = self.queue.get(10000000000) + request, session = self.queue.get(10000000000) try: - self.process(request) + self.process(request, session) except: traceback.print_exc(file=sys.stdout) @@ -83,11 +83,12 @@ class RequestDispatcher(threading.Thread): self.internal_ids = {} self.internal_id = 1 self.lock = threading.Lock() + self.idlock = threading.Lock() self.sessions = [] self.processors = {} - def push_response(self, item): - self.response_queue.put(item) + def push_response(self, session, item): + self.response_queue.put((session, item)) def pop_response(self): return self.response_queue.get() @@ -104,11 +105,11 @@ class RequestDispatcher(threading.Thread): return x def get_session_id(self, internal_id): - with self.lock: + with self.idlock: return self.internal_ids.pop(internal_id) def store_session_id(self, session, msgid): - with self.lock: + with self.idlock: self.internal_ids[self.internal_id] = session, msgid r = self.internal_id self.internal_id += 1 @@ -137,13 +138,9 @@ class RequestDispatcher(threading.Thread): suffix = method.split('.')[-1] if session is not None: - is_new = session.protocol_version >= 0.5 if suffix == 'subscribe': session.subscribe_to_service(method, params) - # store session and id locally - request['id'] = self.store_session_id(session, request['id']) - prefix = request['method'].split('.')[0] try: p = self.processors[prefix] @@ -151,7 +148,7 @@ class RequestDispatcher(threading.Thread): print_log("error: no processor for", prefix) return - p.add_request(request) + p.add_request(session, request) if method in ['server.version']: session.version = params[0] @@ -160,9 +157,6 @@ class RequestDispatcher(threading.Thread): except: pass - #if session.protocol_version < 0.6: - # print_log("stopping session from old client", session.protocol_version) - # session.stop() def get_sessions(self): with self.lock: @@ -180,11 +174,21 @@ class RequestDispatcher(threading.Thread): sessions = self.sessions[:] active_sessions = [] + + now = time.time() + for session in sessions: + if (now - session.time) > 1000: + session.stop() + + bp = self.processors['blockchain'] + for session in sessions: if not session.stopped(): # If session is still alive then re-add it back # to our internal register active_sessions.append(session) + else: + session.stop_subscriptions(bp) with self.lock: self.sessions = active_sessions[:] @@ -204,6 +208,7 @@ class Session: self.time = time.time() threading.Timer(2, self.info).start() + # Debugging method. Doesn't need to be threadsafe. def info(self): for sub in self.subscriptions: @@ -226,30 +231,37 @@ class Session: with self.lock: return self._stopped + def subscribe_to_service(self, method, params): - subdesc = self.build_subdesc(method, params) with self.lock: - if subdesc is not None: - self.subscriptions.append(subdesc) - - # subdesc = A subscription description - @staticmethod - def build_subdesc(method, params): - if method == "blockchain.numblocks.subscribe": - return method, - elif method == "blockchain.headers.subscribe": - return method, - elif method in ["blockchain.address.subscribe"]: - if not params: - return None - else: - return method, params[0] - else: - return None + if (method, params) not in self.subscriptions: + self.subscriptions.append((method,params)) + + + def stop_subscriptions(self, bp): + with self.lock: + s = self.subscriptions[:] + + for method, params in s: + with bp.watch_lock: + if method == 'blockchain.numblocks.subscribe': + if self in bp.watch_blocks: + bp.watch_blocks.remove(self) + elif method == 'blockchain.headers.subscribe': + if self in bp.watch_headers: + bp.watch_headers.remove(self) + elif method == "blockchain.address.subscribe": + addr = params[0] + l = bp.watched_addresses.get(addr) + if not l: + continue + if self in l: + l.remove(self) + if l == []: + bp.watched_addresses.pop(addr) - def contains_subscription(self, subdesc): with self.lock: - return subdesc in self.subscriptions + self.subscriptions = [] class ResponseDispatcher(threading.Thread): @@ -262,48 +274,5 @@ class ResponseDispatcher(threading.Thread): def run(self): while not self.shared.stopped(): - self.update() - - def update(self): - response = self.request_dispatcher.pop_response() - #print "pop response", response - internal_id = response.get('id') - method = response.get('method') - params = response.get('params') - - # A notification - if internal_id is None: # and method is not None and params is not None: - found = self.notification(method, params, response) - if not found and method == 'blockchain.address.subscribe': - request = { - 'id': None, - 'method': method.replace('.subscribe', '.unsubscribe'), - 'params': [self.shared.config.get('server', 'password')] + params, - } - - self.request_dispatcher.push_request(None, request) - # A response - elif internal_id is not None: - self.send_response(internal_id, response) - else: - print_log("no method", response) - - def notification(self, method, params, response): - subdesc = Session.build_subdesc(method, params) - found = False - for session in self.request_dispatcher.sessions: - if session.stopped(): - continue - if session.contains_subscription(subdesc): - session.send_response(response) - found = True - # if not found: print_log("no subscriber for", subdesc) - return found - - def send_response(self, internal_id, response): - session, message_id = self.request_dispatcher.get_session_id(internal_id) - if session: - response['id'] = message_id + session, response = self.request_dispatcher.pop_response() session.send_response(response) - #else: - # print_log("send_response: no session", message_id, internal_id, response )