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

add debug

Browse Source
This commit is contained in:
chrys 2017-07-01 23:10:48 +02:00
parent 570d800152
commit 9c137ef27b
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -98,39 +98,41 @@ class driver():
self.env['screen']['autoIgnoreScreens'] = [] self.env['screen']['autoIgnoreScreens'] = []
def updateWatchdog(self,active , eventQueue): def updateWatchdog(self,active , eventQueue):
vcsa = {} try:
for i in range(1,7): vcsa = {}
vcsa[str(i)] = open('/dev/vcsa'+str(i),'rb') for i in range(1,7):
vcsa[str(i)] = open('/dev/vcsa'+str(i),'rb')
tty = open('/sys/devices/virtual/tty/tty0/active','r') tty = open('/sys/devices/virtual/tty/tty0/active','r')
currScreen = str(tty.read()[3:-1]) currScreen = str(tty.read()[3:-1])
oldScreen = currScreen oldScreen = currScreen
watchdog = select.epoll() watchdog = select.epoll()
watchdog.register(vcsa[currScreen], select.EPOLLPRI) watchdog.register(vcsa[currScreen], select.EPOLLPRI)
watchdog.register(tty, select.EPOLLPRI) watchdog.register(tty, select.EPOLLPRI)
lastScreenContent = b'' lastScreenContent = b''
while active.value == 1: while active.value == 1:
changes = watchdog.poll(2) changes = watchdog.poll(2)
for change in changes: for change in changes:
fileno = change[0] fileno = change[0]
event = change[1] event = change[1]
if fileno == tty.fileno(): if fileno == tty.fileno():
tty.seek(0) tty.seek(0)
currScreen = str(tty.read()[3:-1]) currScreen = str(tty.read()[3:-1])
if currScreen != oldScreen: if currScreen != oldScreen:
watchdog.unregister(vcsa[ oldScreen ]) watchdog.unregister(vcsa[ oldScreen ])
watchdog.register(vcsa[ currScreen ], select.EPOLLPRI) watchdog.register(vcsa[ currScreen ], select.EPOLLPRI)
oldScreen = currScreen oldScreen = currScreen
eventQueue.put({"Type":fenrirEventType.ScreenChanged,"Data":''}) eventQueue.put({"Type":fenrirEventType.ScreenChanged,"Data":''})
vcsa[currScreen].seek(0) vcsa[currScreen].seek(0)
lastScreenContent = vcsa[currScreen].read() lastScreenContent = vcsa[currScreen].read()
else: else:
vcsa[currScreen].seek(0) vcsa[currScreen].seek(0)
screenContent = vcsa[currScreen].read() screenContent = vcsa[currScreen].read()
if screenContent != lastScreenContent: if screenContent != lastScreenContent:
eventQueue.put({"Type":fenrirEventType.ScreenUpdate,"Data":''}) eventQueue.put({"Type":fenrirEventType.ScreenUpdate,"Data":''})
lastScreenContent = screenContent lastScreenContent = screenContent
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('VCSA:updateWatchdog:' + str(e),debug.debugLevel.ERROR)
def update(self, trigger='onUpdate'): def update(self, trigger='onUpdate'):
if trigger == 'onInput': # no need for an update on input for VCSA if trigger == 'onInput': # no need for an update on input for VCSA
return return