storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve termination of threads

Browse Source
This commit is contained in:
chrys 2018-03-25 16:05:10 +02:00
parent f01583b13c
commit d2cc7192b3
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fenrirscreenreader/core/fenrirManager.py
View File

@ -19,7 +19,7 @@ class fenrirManager():
if not cliArgs:
return
try:
self.environment = settingsManager.settingsManager().initFenrirConfig(cliArgs, self)
self.environment = settingsManager.settingsManager().initFenrirConfig(cliArgs, self)
if not self.environment:
raise RuntimeError('Cannot Initialize. Maybe the configfile is not available or not parseable')
except RuntimeError:

17
src/fenrirscreenreader/core/processManager.py
View File

@ -6,7 +6,7 @@
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.eventData import fenrirEventType
import time
import time, signal
from threading import Thread
from multiprocessing import Process
@ -25,8 +25,13 @@ class processManager():
for proc in self._Processes:
try:
proc.terminate()
except Exception as e:
print(e)
except KeyboardInterrupt:
pass
except:
pass
proc.join()
for t in self._Threads:
t.join()
def heartBeatTimer(self, active):
try:
time.sleep(0.5)
@ -35,6 +40,7 @@ class processManager():
return time.time()
def addCustomEventThread(self, function, pargs = None, multiprocess = False, runOnce = False):
eventQueue = self.env['runtime']['eventManager'].getEventQueue()
original_sigint_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
if multiprocess:
t = Process(target=self.customEventWorkerThread, args=(eventQueue, function, pargs, runOnce))
self._Processes.append(t)
@ -42,8 +48,9 @@ class processManager():
t = Thread(target=self.customEventWorkerThread, args=(eventQueue, function, pargs, runOnce))
self._Threads.append(t)
t.start()
signal.signal(signal.SIGINT, original_sigint_handler)
def addSimpleEventThread(self, event, function, pargs = None, multiprocess = False, runOnce = False):
original_sigint_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
if multiprocess:
t = Process(target=self.simpleEventWorkerThread, args=(event, function, pargs, runOnce))
self._Processes.append(t)
@ -51,7 +58,7 @@ class processManager():
t = Thread(target=self.simpleEventWorkerThread, args=(event, function, pargs, runOnce))
self._Threads.append(t)
t.start()
signal.signal(signal.SIGINT, original_sigint_handler)
def customEventWorkerThread(self, eventQueue, function, pargs = None, runOnce = False):
#if not isinstance(eventQueue, Queue):
# return

2
src/fenrirscreenreader/screenDriver/ptyDriver.py
View File

@ -57,7 +57,7 @@ class driver(screenDriver):
signal.signal(signal.SIGWINCH, self.handleSigwinch)
def initialize(self, environment):
self.env = environment
self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation)
self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation)
def getCurrScreen(self):
self.env['screen']['oldTTY'] = '1'
self.env['screen']['newTTY'] = '1'

2
src/fenrirscreenreader/screenDriver/vcsaDriver.py
View File

@ -34,7 +34,7 @@ class driver(screenDriver):
self.hichar = None
def initialize(self, environment):
self.env = environment
self.env['runtime']['processManager'].addCustomEventThread(self.updateWatchdog)
self.env['runtime']['processManager'].addCustomEventThread(self.updateWatchdog, multiprocess=True)
def getCurrScreen(self):
self.env['screen']['oldTTY'] = self.env['screen']['newTTY']
try: