import time
import Queue as queue
-class Processor(threading.Thread):
+from processor import Session, Dispatcher, Shared
- 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()
-
- 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 pop_response(self):
- return self.response_queue.get()
-
- def push_request(self, session, item):
- self.request_queue.put((session,item))
-
- def pop_request(self):
- return self.request_queue.get()
-
- 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)
-
- self.stop()
-
- def stop(self):
- pass
-
- def process(self, session, request):
- print "New request", request
- # Do stuff...
- # response = request
- # When ready, you call
- # self.push_response(session,response)
-
-class Session:
+class TcpSession(Session):
def __init__(self, connection, address):
self._connection = connection
self.address = address
- self._stopped = False
- self.lock = threading.Lock()
- self.numblocks_sub = None
- self.addresses_sub = {}
-
- def stop(self):
- self._connection.close()
- print "Terminating connection:", self.address[0]
- with self.lock:
- self._stopped = True
-
- def stopped(self):
- with self.lock:
- return self._stopped
+ Session.__init__(self)
def connection(self):
if self.stopped():
else:
return self._connection
- def subscribe_to_numblocks(self,message_id):
- with self.lock:
- self.numblocks_sub = message_id
-
- def subscribe_to_address(self,address,message_id,status):
+ def stop(self):
+ self._connection.close()
+ print "Terminating connection:", self.address[0]
with self.lock:
- self.addresses_sub[address] = message_id,status
-
+ self._stopped = True
-class TcpResponder(threading.Thread):
+ def send_response(self, response):
+ raw_response = json.dumps(response)
+ # Possible race condition here by having session
+ # close connection?
+ # I assume Python connections are thread safe interfaces
+ try:
+ connection = self.connection()
+ connection.send(raw_response + "\n")
+ except:
+ self.stop()
- def __init__(self, shared, processor):
- self.shared = shared
- self.processor = processor
- 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()
- try:
- 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()
- return
+ break
+
+ while self.parse():
+ pass
def update(self):
data = self.receive()
- if data is None:
+ if not data:
# close_session
- self.stop()
+ self.session.stop()
return False
self.message += data
- if not self.parse():
- return False
return True
def receive(self):
try:
return self.session.connection().recv(1024)
- except socket.error:
- return None
+ except:
+ return ''
def parse(self):
raw_buffer = self.message.find('\n')
if raw_buffer == -1:
- return True
+ return False
raw_command = self.message[0:raw_buffer].strip()
self.message = self.message[raw_buffer + 1:]
if raw_command == 'quit':
+ self.session.stop()
return False
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 = []
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.start()
while not self.shared.stopped():
- session = Session(*sock.accept())
+ session = TcpSession(*sock.accept())
client_req = TcpClientRequestor(self.shared, self.processor, session)
client_req.start()
self.processor.add_session(session)
+ self.processor.collect_garbage()
-class Shared:
- def __init__(self):
- self.lock = threading.Lock()
- self._stopped = False
-
- def stop(self):
- print "Stopping Stratum"
- with self.lock:
- self._stopped = True
- def stopped(self):
- with self.lock:
- return self._stopped
class Stratum:
processor.shared = shared
processor.start()
# Create various transports we need
- transports = TcpServer(shared, processor, "ecdsa.org", 50002),
+ transports = TcpServer(shared, processor, "176.31.24.241", 50001),
for server in transports:
server.start()
while not shared.stopped():
git://git.novaco.in / electrum-server.git / blobdiff