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

Merge pull request #65 from jesopo/feature/poll

Browse source 
select.epoll -> select.poll
This commit is contained in:
jesopo 2019-06-06 20:31:52 +01:00 committed by GitHub
commit 53262d4f36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/IRCBot.py
View file

@ -26,7 +26,7 @@ class Bot(object):
self.start_time = time.time() self.start_time = time.time()
self.lock = threading.Lock() self.lock = threading.Lock()
self.running = True self.running = True
self.poll = select.epoll() self.poll = select.poll()
self.servers = {} self.servers = {}
self.other_sockets = {} self.other_sockets = {}
@ -97,7 +97,7 @@ class Bot(object):
def add_socket(self, sock: socket.socket): def add_socket(self, sock: socket.socket):
self.other_sockets[sock.fileno()] = sock self.other_sockets[sock.fileno()] = sock
self.poll.register(sock.fileno(), select.EPOLLIN) self.poll.register(sock.fileno(), select.POLLIN)
def remove_socket(self, sock: socket.socket): def remove_socket(self, sock: socket.socket):
del self.other_sockets[sock.fileno()] del self.other_sockets[sock.fileno()]
@ -123,7 +123,7 @@ class Bot(object):
[str(server), str(e)]) [str(server), str(e)])
return False return False
self.servers[server.fileno()] = server self.servers[server.fileno()] = server
self.poll.register(server.fileno(), select.EPOLLOUT) self.poll.register(server.fileno(), select.POLLOUT)
return True return True
def next_send(self) -> typing.Optional[float]: def next_send(self) -> typing.Optional[float]:
@ -163,12 +163,12 @@ class Bot(object):
return min([timeout for timeout in timeouts if not timeout == None]) return min([timeout for timeout in timeouts if not timeout == None])
def register_read(self, server: IRCServer.Server): def register_read(self, server: IRCServer.Server):
self.poll.modify(server.fileno(), select.EPOLLIN) self.poll.modify(server.fileno(), select.POLLIN)
def register_write(self, server: IRCServer.Server): def register_write(self, server: IRCServer.Server):
self.poll.modify(server.fileno(), select.EPOLLOUT) self.poll.modify(server.fileno(), select.POLLOUT)
def register_both(self, server: IRCServer.Server): def register_both(self, server: IRCServer.Server):
self.poll.modify(server.fileno(), self.poll.modify(server.fileno(),
select.EPOLLIN|select.EPOLLOUT) select.POLLIN|select.POLLOUT)
def disconnect(self, server: IRCServer.Server): def disconnect(self, server: IRCServer.Server):
try: try:
@ -238,7 +238,7 @@ class Bot(object):
sock = self.other_sockets[fd] sock = self.other_sockets[fd]
if sock: if sock:
if event & select.EPOLLIN: if event & select.POLLIN:
data = sock.read() data = sock.read()
if data == None: if data == None:
sock.disconnect() sock.disconnect()
@ -246,7 +246,7 @@ class Bot(object):
for piece in data: for piece in data:
sock.parse_data(piece) sock.parse_data(piece)
elif event & select.EPOLLOUT: elif event & select.POLLOUT:
try: try:
sock._send() sock._send()
except: except:
@ -256,8 +256,8 @@ class Bot(object):
if sock.fileno() in self.servers: if sock.fileno() in self.servers:
self.register_read(sock) self.register_read(sock)
elif event & select.EPULLHUP: elif event & select.POLLHUP:
self.log.warn("Recieved EPOLLHUP for %s", [str(sock)]) self.log.warn("Recieved POLLHUP for %s", [str(sock)])
sock.disconnect() sock.disconnect()
for server in list(self.servers.values()): for server in list(self.servers.values()):