jaseg/matelight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

multithreaded frame-queueing and polling in the server classes

Browse source
This commit is contained in:
Uwe Kamper 2014-03-07 22:18:10 +01:00
parent 8f86c5ac45
commit b503b8fffc
1 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

45
host/server.py
View file

@ -83,7 +83,29 @@ def log(*args):
print(strftime('[%m-%d %H:%M:%S]'), ' '.join(str(arg) for arg in args), '\x1B[0m') print(strftime('[%m-%d %H:%M:%S]'), ' '.join(str(arg) for arg in args), '\x1B[0m')
printlock.release() printlock.release()
class MateLightUDPServer(UDPServer):
"""
The server class for the SocketServer interface.
"""
def __init__(self, *args, **kwargs):
"""
Setup the deque for the frame
"""
super(MateLightUDPServer, self).__init__(*args, **kwargs)
self.frame_deque = collections.deque(maxlen=30)
def get_next_frame(self):
try:
return self.frame_deque.popleft()
except IndexError:
return None
class MateLightUDPHandler(BaseRequestHandler): class MateLightUDPHandler(BaseRequestHandler):
"""
Handles one UDP connection to the matelight
"""
def handle(self): def handle(self):
try: try:
# Housekeeping - FIXME: This is *so* the wrong place for this. # Housekeeping - FIXME: This is *so* the wrong place for this.
@ -113,8 +135,9 @@ class MateLightUDPHandler(BaseRequestHandler):
if current_entry.entrytype == 'udp' and current_entry.remote == addr: if current_entry.entrytype == 'udp' and current_entry.remote == addr:
current_entry = conn current_entry = conn
frame = a.reshape((DISPLAY_HEIGHT, DISPLAY_WIDTH, 3)) frame = a.reshape((DISPLAY_HEIGHT, DISPLAY_WIDTH, 3))
sendframe(frame) self.server.frame_deque.append(frame)
printframe(np.pad(frame, ((0,0),(0,0),(0,1)), 'constant', constant_values=(0,0))) #sendframe(frame)
#printframe(np.pad(frame, ((0,0),(0,0),(0,1)), 'constant', constant_values=(0,0)))
except Exception as e: except Exception as e:
log('Error receiving UDP frame:', e) log('Error receiving UDP frame:', e)
@ -131,19 +154,25 @@ class MateLightTCPTextHandler(BaseRequestHandler):
textqueue.append(QueueEntry('text', addr, timestamp, data)) textqueue.append(QueueEntry('text', addr, timestamp, data))
self.request.sendall(b'KTHXBYE!\n') self.request.sendall(b'KTHXBYE!\n')
TCPServer.allow_reuse_address = True #TCPServer.allow_reuse_address = True
server = TCPServer(('', 1337), MateLightTCPTextHandler) #server = TCPServer(('', 1337), MateLightTCPTextHandler)
t = threading.Thread(target=server.serve_forever) #t = threading.Thread(target=server.serve_forever)
t.daemon = True #t.daemon = True
t.start() #t.start()
UDPServer.allow_reuse_address = True UDPServer.allow_reuse_address = True
userver = UDPServer(('', 1337), MateLightUDPHandler) userver = MateLightUDPServer(('', 1337), MateLightUDPHandler)
t = threading.Thread(target=userver.serve_forever) t = threading.Thread(target=userver.serve_forever)
t.daemon = True t.daemon = True
t.start() t.start()
if __name__ == '__main__': if __name__ == '__main__':
while True:
next_frame = userver.get_next_frame()
if next_frame:
sendframe(next_frame)
def bla():
print('\033[2J'+'\n'*9) print('\033[2J'+'\n'*9)
while True: while True:
if current_entry.entrytype == 'text': if current_entry.entrytype == 'text':