Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

add assert to verify no need for mutex

Browse source
This commit is contained in:
Eric House 2018-05-31 21:20:42 -07:00
parent dff130d6c6
commit b24d60e7bf
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/linux/scripts/discon_ok2.py
View file

@ -185,6 +185,7 @@ class Device():
self.nTilesLeftTray = None self.nTilesLeftTray = None
self.relayID = None self.relayID = None
self.relaySeed = 0 self.relaySeed = 0
self.locked = False
with open(self.logPath, "w") as log: with open(self.logPath, "w") as log:
log.write('New cmdline: ' + self.app + ' ' + (' '.join([str(p) for p in self.params]))) log.write('New cmdline: ' + self.app + ' ' + (' '.join([str(p) for p in self.params])))
@ -200,6 +201,8 @@ class Device():
nLines += 1 nLines += 1
log.write(line + os.linesep) log.write(line + os.linesep)
self.locked = True
# check for connname # check for connname
if not self.connname: if not self.connname:
match = Device.sConnNamePat.match(line) match = Device.sConnNamePat.match(line)
@ -228,6 +231,8 @@ class Device():
self.relaySeed = int(match.group(1)) self.relaySeed = int(match.group(1))
self.relayID = match.group(2) self.relayID = match.group(2)
self.locked = False
# print('logReaderMain done, wrote lines:', nLines, 'to', self.logPath); # print('logReaderMain done, wrote lines:', nLines, 'to', self.logPath);
def launch(self): def launch(self):
@ -293,6 +298,7 @@ class Device():
print('got exception sending to', url, params, '; is relay.py running as apache module?') print('got exception sending to', url, params, '; is relay.py running as apache module?')
def getTilesCount(self): def getTilesCount(self):
assert not self.locked
return {'index': self.indx, return {'index': self.indx,
'nTilesLeftPool': self.nTilesLeftPool, 'nTilesLeftPool': self.nTilesLeftPool,
'nTilesLeftTray': self.nTilesLeftTray, 'nTilesLeftTray': self.nTilesLeftTray,