Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Only trigger read/write threads once

Browse source
This commit is contained in:
jesopo 2019-06-06 19:21:18 +01:00
parent 05fcb33ff7
commit 5b7d8dea91
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/IRCBot.py
View file

@ -40,6 +40,11 @@ class Bot(object):
self._write_poll.register(self._wtrigger_server.fileno(), self._write_poll.register(self._wtrigger_server.fileno(),
select.EPOLLIN) select.EPOLLIN)
self._rtrigger_lock = threading.Lock()
self._rtriggered = False
self._wtrigger_lock = threading.Lock()
self._wtriggered = False
self._read_thread = None self._read_thread = None
self._write_thread = None self._write_thread = None
@ -50,8 +55,14 @@ class Bot(object):
self.trigger_read() self.trigger_read()
self.trigger_write() self.trigger_write()
def trigger_read(self): def trigger_read(self):
with self._rtrigger_lock:
if not self._rtriggered:
self._rtriggered = True
self._rtrigger_client.send(b"TRIGGER") self._rtrigger_client.send(b"TRIGGER")
def trigger_write(self): def trigger_write(self):
with self._wtrigger_lock:
if not self._wtriggered:
self._wtriggered = True
self._wtrigger_client.send(b"TRIGGER") self._wtrigger_client.send(b"TRIGGER")
def trigger(self, def trigger(self,
@ -251,6 +262,8 @@ class Bot(object):
if fd == self._wtrigger_server.fileno(): if fd == self._wtrigger_server.fileno():
# throw away data from trigger socket # throw away data from trigger socket
self._wtrigger_server.recv(1024) self._wtrigger_server.recv(1024)
with self._wtrigger_lock:
self._wtriggered = False
elif event & select.EPOLLOUT: elif event & select.EPOLLOUT:
self._write_poll.unregister(fd) self._write_poll.unregister(fd)
server = self.servers[fd] server = self.servers[fd]
@ -287,6 +300,8 @@ class Bot(object):
if fd == self._rtrigger_server.fileno(): if fd == self._rtrigger_server.fileno():
# throw away data from trigger socket # throw away data from trigger socket
self._rtrigger_server.recv(1024) self._rtrigger_server.recv(1024)
with self._rtrigger_lock:
self._rtriggered = False
else: else:
server = self.servers[fd] server = self.servers[fd]
if event & select.EPOLLIN: if event & select.EPOLLIN: