Skip to content

Commit 0f5d5ce

Browse files
committed
uasyncio: Add minimum esp8266 support
1 parent 6256ad6 commit 0f5d5ce

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

uasyncio.core/uasyncio/core.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ def run_forever(self):
9393
# self.add_reader(ret.obj.fileno(), lambda self, c, f: self.call_soon(c, f), self, cb, ret.obj)
9494
# self.add_reader(ret.obj.fileno(), lambda c, f: self.call_soon(c, f), cb, ret.obj)
9595
# self.add_reader(arg.fileno(), lambda cb: self.call_soon(cb), cb)
96-
self.add_reader(arg.fileno(), cb)
96+
self.add_reader(arg, cb)
9797
continue
9898
elif isinstance(ret, IOWrite):
9999
# self.add_writer(arg.fileno(), lambda cb: self.call_soon(cb), cb)
100-
self.add_writer(arg.fileno(), cb)
100+
self.add_writer(arg, cb)
101101
continue
102102
elif isinstance(ret, IOReadDone):
103-
self.remove_reader(arg.fileno())
103+
self.remove_reader(arg)
104104
elif isinstance(ret, IOWriteDone):
105-
self.remove_writer(arg.fileno())
105+
self.remove_writer(arg)
106106
elif isinstance(ret, StopLoop):
107107
return arg
108108
else:

uasyncio/uasyncio/__init__.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@ def __init__(self):
1111
self.poller = select.poll()
1212
self.objmap = {}
1313

14-
def add_reader(self, fd, cb, *args):
14+
def add_reader(self, sock, cb, *args):
1515
if DEBUG and __debug__:
16-
log.debug("add_reader%s", (fd, cb, args))
16+
log.debug("add_reader%s", (sock, cb, args))
1717
if args:
18-
self.poller.register(fd, select.POLLIN)
19-
self.objmap[fd] = (cb, args)
18+
self.poller.register(sock, select.POLLIN)
19+
self.objmap[id(sock)] = (cb, args)
2020
else:
21-
self.poller.register(fd, select.POLLIN)
22-
self.objmap[fd] = cb
21+
self.poller.register(sock, select.POLLIN)
22+
self.objmap[id(sock)] = cb
2323

24-
def remove_reader(self, fd):
24+
def remove_reader(self, sock):
2525
if DEBUG and __debug__:
26-
log.debug("remove_reader(%s)", fd)
27-
self.poller.unregister(fd)
28-
del self.objmap[fd]
26+
log.debug("remove_reader(%s)", sock)
27+
self.poller.unregister(sock)
28+
del self.objmap[id(sock)]
2929

30-
def add_writer(self, fd, cb, *args):
30+
def add_writer(self, sock, cb, *args):
3131
if DEBUG and __debug__:
32-
log.debug("add_writer%s", (fd, cb, args))
32+
log.debug("add_writer%s", (sock, cb, args))
3333
if args:
34-
self.poller.register(fd, select.POLLOUT)
35-
self.objmap[fd] = (cb, args)
34+
self.poller.register(sock, select.POLLOUT)
35+
self.objmap[id(sock)] = (cb, args)
3636
else:
37-
self.poller.register(fd, select.POLLOUT)
38-
self.objmap[fd] = cb
37+
self.poller.register(sock, select.POLLOUT)
38+
self.objmap[id(sock)] = cb
3939

40-
def remove_writer(self, fd):
40+
def remove_writer(self, sock):
4141
if DEBUG and __debug__:
42-
log.debug("remove_writer(%s)", fd)
42+
log.debug("remove_writer(%s)", sock)
4343
try:
44-
self.poller.unregister(fd)
45-
self.objmap.pop(fd, None)
44+
self.poller.unregister(sock)
45+
self.objmap.pop(id(sock), None)
4646
except OSError as e:
47-
# StreamWriter.awrite() first tries to write to an fd,
47+
# StreamWriter.awrite() first tries to write to a socket,
4848
# and if that succeeds, yield IOWrite may never be called
49-
# for that fd, and it will never be added to poller. So,
49+
# for that socket, and it will never be added to poller. So,
5050
# ignore such error.
5151
if e.args[0] != errno.ENOENT:
5252
raise
@@ -63,8 +63,8 @@ def wait(self, delay):
6363
# Remove "if res" workaround after
6464
# https://github.com/micropython/micropython/issues/2716 fixed.
6565
if res:
66-
for fd, ev in res:
67-
cb = self.objmap[fd]
66+
for sock, ev in res:
67+
cb = self.objmap[id(sock)]
6868
if DEBUG and __debug__:
6969
log.debug("Calling IO callback: %r", cb)
7070
if isinstance(cb, tuple):

0 commit comments

Comments
 (0)