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

remove debug hell

Browse Source
This commit is contained in:
Chrys 2019-08-22 22:13:15 +02:00
parent 3a86f2f9d0
commit bf49e9d72a
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,36 +104,23 @@ class driver(screenDriver):
vcsu = {} vcsu = {}
vcsuDevices = None vcsuDevices = None
lastScreenContent = b'' lastScreenContent = b''
self.env['runtime']['debug'].writeDebugOut('1',debug.debugLevel.ERROR)
tty = open('/sys/devices/virtual/tty/tty0/active','r') tty = open('/sys/devices/virtual/tty/tty0/active','r')
self.env['runtime']['debug'].writeDebugOut('2',debug.debugLevel.ERROR)
currScreen = str(tty.read()[3:-1]) currScreen = str(tty.read()[3:-1])
self.env['runtime']['debug'].writeDebugOut('3',debug.debugLevel.ERROR)
oldScreen = currScreen oldScreen = currScreen
self.env['runtime']['debug'].writeDebugOut('4',debug.debugLevel.ERROR)
for vcsaDev in vcsaDevices: for vcsaDev in vcsaDevices:
index = str(vcsaDev[9:]) index = str(vcsaDev[9:])
self.env['runtime']['debug'].writeDebugOut('5',debug.debugLevel.ERROR)
vcsa[index] = open(vcsaDev,'rb') vcsa[index] = open(vcsaDev,'rb')
self.env['runtime']['debug'].writeDebugOut('6',debug.debugLevel.ERROR)
if index == currScreen: if index == currScreen:
self.env['runtime']['debug'].writeDebugOut('7',debug.debugLevel.ERROR)
lastScreenContent = vcsa[index].read() lastScreenContent = vcsa[index].read()
self.env['runtime']['debug'].writeDebugOut('8',debug.debugLevel.ERROR)
if useVCSU: if useVCSU:
self.env['runtime']['debug'].writeDebugOut('VCSU',debug.debugLevel.ERROR)
vcsuDevices = glob.glob('/dev/vcsu*') vcsuDevices = glob.glob('/dev/vcsu*')
for vcsuDev in vcsuDevices: for vcsuDev in vcsuDevices:
self.env['runtime']['debug'].writeDebugOut('9',debug.debugLevel.ERROR)
index = str(vcsuDev[9:]) index = str(vcsuDev[9:])
self.env['runtime']['debug'].writeDebugOut('10',debug.debugLevel.ERROR)
vcsu[index] = open(vcsuDev,'rb') vcsu[index] = open(vcsuDev,'rb')
self.env['runtime']['debug'].writeDebugOut('charmap',debug.debugLevel.ERROR)
self.updateCharMap(currScreen) self.updateCharMap(currScreen)
watchdog = select.epoll() watchdog = select.epoll()
watchdog.register(vcsa[currScreen], select.POLLPRI | select.POLLERR) watchdog.register(vcsa[currScreen], select.POLLPRI | select.POLLERR)
watchdog.register(tty, select.POLLPRI | select.POLLERR) watchdog.register(tty, select.POLLPRI | select.POLLERR)
self.env['runtime']['debug'].writeDebugOut('start',debug.debugLevel.ERROR)
while active.value == 1: while active.value == 1:
changes = watchdog.poll(1) changes = watchdog.poll(1)
for change in changes: for change in changes:
@ -188,7 +175,7 @@ class driver(screenDriver):
# anything else? wait for completion # anything else? wait for completion
while True: while True:
screenContent = dirtyContent screenContent = dirtyContent
r,_,_ = select.select([vcsu[currScreen]], [], [], 0.07) r,_,_ = select.select([vcsa[currScreen]], [], [], 0.07)
if not vcsa[currScreen] in r: if not vcsa[currScreen] in r:
break break
vcsa[currScreen].seek(0) vcsa[currScreen].seek(0)