Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Socket: Move call to supybot.drivers.poll outside the critical section. 

It may do some non-trivial stuff (eg. calling registry callbacks);
and the less code in the locked-section the better.
This commit is contained in:
Valentin Lorentz 2020-05-29 19:41:09 +02:00
parent aa2f9202ec
commit 88549f9faa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/Socket.py
View File

@ -145,6 +145,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
@classmethod @classmethod
def _select(cls): def _select(cls):
timeout = conf.supybot.drivers.poll()
try: try:
if not cls._selecting.acquire(blocking=False): if not cls._selecting.acquire(blocking=False):
# there's already a thread running this code, abort. # there's already a thread running this code, abort.
@ -162,7 +163,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
if not cls._instances: if not cls._instances:
return return
rlist, wlist, xlist = select.select([x.conn for x in cls._instances], rlist, wlist, xlist = select.select([x.conn for x in cls._instances],
[], [], conf.supybot.drivers.poll()) [], [], timeout)
for instance in cls._instances: for instance in cls._instances:
if instance.conn in rlist: if instance.conn in rlist:
instance._read() instance._read()