OneEye Changeset - dc1ed8ff56ef

Changeset - dc1ed8ff56ef

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Laman - 6 years ago 2018-12-12 23:48:38

cleaned up and documented shutdown

5 files changed with 41 insertions and 46 deletions:

overview.md

src/core.py

src/gui/__init__.py

src/util.py

src/video.py

0 comments (0 inline, 0 general)

overview.md

➞

Show inline comments

 Processes and threads
 =====================
 Processes communicate through MsgQueues (a wrapper around multiprocessing.Queue). Each owns one incoming and holds any number of outcoming queues. The queue runs in one thread, reads messages and calls handlers on its owner.
 Processes communicate through MsgQueues (a wrapper around multiprocessing.Queue).
 Each owns one incoming and holds any number of outcoming queues.
 The queue runs in one thread, reads messages and calls handlers on its owner.
 A shutdown is initiated by closing the GUI.
 It closes its MsgQueue and exits its mainloop.
 End of GUI process is waited on by the Core.
 It follows by sending VideoCapture process an "shutdown" order and then waits on its end.
 The VideoCapture closes its MsgQueue and sets its main loop for a break with its _shutdown attribute.
 Finally the Core closes its MsgQueue and exits.
 Core
 ----
 * Main process, starts GUI and VideoCapture. Waits for them to finish.
 * Runs ImageAnalyzer and StateBag.
 * Messages API:
 	* putFrame(frame)
 	* setParams(params)
 	* fetchFrame(key)
 	* fetchParams(params)
 GUI

src/core.py

➞

Show inline comments

@@ @@ -15,27 +15,28 @@ from video import capVideo @@
 log=logging.getLogger(__name__)
 class Core:
 	def __init__(self):
 		self.grid=None
 		self.go=Go()
 		self.detector=ImageAnalyzer()
 		self._cache=FrameCache()
 		self.states=StateBag()
 		self._ownMessages=MsgQueue(self._handleEvent)
 		self._guiMessages=MsgQueue()
 		self._vidMessages=MsgQueue()
 		self._ownMessages=MsgQueue("Core",self._handleEvent)
 		self._guiMessages=MsgQueue("GUI")
 		self._vidMessages=MsgQueue("Video")
 		self._listenerThread=None
 		self._frame=None
 		self._guiProc=multiprocessing.Process(name="gui", target=gui, args=(self._guiMessages,self._ownMessages))
 		self._guiProc.start()
 		self._vidProc=multiprocessing.Process(
 			name="video",
 			target=capVideo,
 			args=(cfg.misc.video, self._vidMessages,self._ownMessages)
+		)
 		self._vidProc.start()
@@ @@ -64,65 +65,40 @@ class Core: @@
 				rec=[]
 				if state:
 					rec=state.exportRecord()
 					log.debug("progressive game record: %s",rec)
 				self._guiMessages.send("setGameState", (self.detector.board,rec))
 				self.go.transitionMove(self.detector.board)
 				log.debug("conservative game record: %s",self.go._record)
 			else:
 				log.info("illegal position detected")
 	def listen(self):
 		listenerThread=threading.Thread(target=lambda: self._ownMessages.listen())
 		listenerThread.start()
 		self._listenerThread=threading.Thread(target=lambda: self._ownMessages.listen())
 		self._listenerThread.start()
 	def joinChildren(self):
 		self._guiProc.join()
 		self._vidMessages.send("shutDown")
 		self._vidProc.join()
 		self._ownMessages.send("!kill",("core",))
 		self._listenerThread.join()
 		log.info("Core exiting.")
 	def _handleEvent(self,e):
 		actions={
 			"fetchFrame": self.fetchFrame,
 			"putFrame": self.putFrame,
 			"fetchParams": self.sendParams,
 			"setParams": self.setParams
+		}
 		(actionName,args,kwargs)=e
 		return actions[actionName](*args,**kwargs)
 if __name__=="__main__":
 	core=Core()
 	core.listen()
 	log.info("OneEye started.")
 	core.joinChildren()
 	log.info("Exited correctly.")
 """
 core
 ====
 grid
 go
 imageAnalyzer
 gui
 ===
 corners
 a) keeps references to important objects and uses them
 b) gets and sets all relevant data through method calls with core
 GUI
 <- addCorner(corner)
 -> redrawImgView(img,grid)
 <- refreshTresholds(tresB,tresW)
 BoardView
 -> redrawState(go)
 core-gui: just pass messages with relevant data (!! always pass object copies, don't share instances)
 """
@@ \ No newline at end of file @@
 	log.info("OneEye done.")

src/gui/__init__.py

➞

Show inline comments

@@ @@ -28,57 +28,62 @@ class GUI: @@
 		self._state=GUI.SETUP
 		self.mainWindow = MainWindow(self, master=self.root)
 		self.settings=None
 		self.root.columnconfigure(0,weight=1)
 		self.root.rowconfigure(0,weight=1)
 		self.root.bind("<<redrawImgView>>", lambda e: self.mainWindow.redrawImgView())
 		self.root.bind("<<setUp>>", lambda e: self.setUp())
 		self.root.bind("<<setRecording>>", lambda e: self.setRecording())
 		self.root.bind("<F12>",lambda e: Settings(self))
-		self.mainWindow.bind("<Destroy>",lambda e: self._ownMessages.send("!kill",("gui",)))
+		self.mainWindow.bind("<Destroy>",lambda e: self._shutDown())
 		self.setUp()
 	def __call__(self,ownMessages,coreMessages):
 		self._ownMessages=ownMessages
 		self._coreMessages=coreMessages
 		self.listenerThread=threading.Thread(target=lambda: ownMessages.listen(self._handleEvent))
 		self.listenerThread.start()
 		self._listenerThread=threading.Thread(target=lambda: ownMessages.listen(self._handleEvent))
 		self._listenerThread.start()
 		self.mainWindow.mainloop()
 	def sendMsg(self,actionName,args=tuple(),kwargs=None):
 		self._coreMessages.send(actionName,args,kwargs)
 	def setUp(self):
 		self.mainWindow.setUp()
 		self.root.bind("<Left>",lambda e: self.sendMsg("prevFrame"))
 		self.root.bind("<Right>",lambda e: self.sendMsg("nextFrame"))
 	def setRecording(self):
 		self.mainWindow.setRecording()
 		self.root.bind("<Left>",lambda e: None)
 		self.root.bind("<Right>",lambda e: None)
 		if self.settings:
 			self.settings.destroy()
 			self.settings=None
 		self.sendParams()
 	def sendParams(self):
 		self.sendMsg("setParams",(self.detector.params.copy(),))
 	def _shutDown(self):
 		log.info("GUI proc exiting.")
 		self._ownMessages.send("!kill",("gui",))
 		self._listenerThread.join()
 	def _handleEvent(self,e):
 		actions={
 			"setFrame": self._frameHandler,
 			"setGameState": self._stateHandler,
 			"setParams": self._paramsHandler
+		}
 		(actionName,args,kwargs)=e
 		return actions[actionName](*args,**kwargs)
 	def _frameHandler(self,frame,type,key):
 		if self._state!=type and self.mainWindow.imgView.isSet():

src/util.py

➞

Show inline comments

@@ @@ -3,47 +3,47 @@ import multiprocessing @@
 import logging
 log=logging.getLogger(__name__)
 EMPTY=0
 BLACK=1
 WHITE=-1
 colorNames={BLACK:"B",WHITE:"W"}
 class MsgQueue:
 	def __init__(self,handler=None):
 	def __init__(self,name,handler=None):
 		self.name=name
 		self._queue=multiprocessing.Queue()
 		self._event=multiprocessing.Event()
 		self._handleEvent=handler
 	def send(self,actionName,args=tuple(),kwargs=None):
 		if kwargs is None: kwargs=dict()
 		self._queue.put((actionName,args,kwargs))
 		self._event.set()
 	def listen(self,handleEvent=None):
 		if handleEvent is not None: self._handleEvent=handleEvent
 		while True:
 			self._event.wait()
 			msg=self._queue.get()
 			if self._queue.empty():
 				self._event.clear()
 			log.info(msg)
 			if msg[0]=="!kill":
 				self._queue.cancel_join_thread()
 				break
 			log.info(msg if msg[0]!="putFrame" else "('putFrame', ..., {})")
 			if msg[0]=="!kill": break
 			self._handleEvent(msg)
 		log.info("%s MsgQueue exiting.",self.name)
 	def setHandler(self,handler):
 		self._handleEvent=handler
 rand=random.Random()
 rand.seed(361)
 zobristNums=tuple(
 	tuple(
 		tuple(rand.getrandbits(32) for i in range(3)) for c in range(19)
 	) for r in range(19)
+)

src/video.py

➞

Show inline comments

 import time
 import threading
 import logging
 import cv2 as cv
 log=logging.getLogger(__name__)
 class VideoCapture:
 	def __init__(self, video_source=0):
 		self._ownMessages=None
 		self._coreMessages=None
 		self._shutdown=False
 		self._vid = cv.VideoCapture(video_source)
 		if not self._vid.isOpened():
 			raise ValueError("Unable to open video source", video_source)
 		self.width = self._vid.get(cv.CAP_PROP_FRAME_WIDTH)
 		self.height = self._vid.get(cv.CAP_PROP_FRAME_HEIGHT)
 	def getFrame(self):
 		if self._vid.isOpened():
 			(res,frame) = self._vid.read()
 			if res:
 				return (res, cv.cvtColor(frame, cv.COLOR_BGR2RGB))
 			else:
 				return (res,None)
 		else:
 			return (False,None)
 	def shutDown(self):
 	def _shutDown(self):
 		log.info("Video proc exiting.")
 		self._ownMessages.send("!kill",("video",))
 		self._shutdown=True
 	def __call__(self,ownMessages,coreMessages):
 		self._ownMessages=ownMessages
 		self._coreMessages=coreMessages
 		self.listenerThread=threading.Thread(target=lambda: ownMessages.listen(self._handleEvent))
 		self.listenerThread.start()
 		self._listenerThread=threading.Thread(target=lambda: ownMessages.listen(self._handleEvent))
 		self._listenerThread.start()
 		t=0
 		while not self._shutdown:
 			self._vid.set(cv.CAP_PROP_POS_MSEC,t*1000)
 			(res,frame)=self.getFrame()
 			if res: self._coreMessages.send("putFrame",(frame,))
 			time.sleep(1)
 			t+=1
 		self._listenerThread.join()
 	def __del__(self):
 		if self._vid.isOpened():
 			self._vid.release()
 	def _handleEvent(self,e):
 		actions={
-			"shutDown": self.shutDown
+			"shutDown": self._shutDown
+		}
 		(actionName,args,kwargs)=e
 		return actions[actionName](*args,**kwargs)
 def capVideo(stream,ownMessages,coreMessages):
 	v=VideoCapture(stream)
 	v(ownMessages,coreMessages)

0 comments (0 inline, 0 general)