Skip to content

uasyncio on esp8266 #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2017
Merged

uasyncio on esp8266 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f5d5ce
uasyncio: Add minimum esp8266 support
mzdaniel Dec 26, 2016
4bc5ab9
uasyncio: Add echo test
mzdaniel Jan 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions uasyncio.core/uasyncio/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ def run_forever(self):
# self.add_reader(ret.obj.fileno(), lambda self, c, f: self.call_soon(c, f), self, cb, ret.obj)
# self.add_reader(ret.obj.fileno(), lambda c, f: self.call_soon(c, f), cb, ret.obj)
# self.add_reader(arg.fileno(), lambda cb: self.call_soon(cb), cb)
self.add_reader(arg.fileno(), cb)
self.add_reader(arg, cb)
continue
elif isinstance(ret, IOWrite):
# self.add_writer(arg.fileno(), lambda cb: self.call_soon(cb), cb)
self.add_writer(arg.fileno(), cb)
self.add_writer(arg, cb)
continue
elif isinstance(ret, IOReadDone):
self.remove_reader(arg.fileno())
self.remove_reader(arg)
elif isinstance(ret, IOWriteDone):
self.remove_writer(arg.fileno())
self.remove_writer(arg)
elif isinstance(ret, StopLoop):
return arg
else:
Expand Down
32 changes: 32 additions & 0 deletions uasyncio/test_echo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from uasyncio import get_event_loop, open_connection, start_server, sleep_ms
from unittest import main, TestCase

class EchoTestCase(TestCase):

def test_client_server(self):
'''Simple client-server echo test'''
sockaddr = ('127.0.0.1', 8080)
l = get_event_loop()

async def echo_server(reader, writer):
data = await reader.readline()
await writer.awrite(data)
await writer.aclose()

async def echo_client(line, result):
await sleep_ms(10) # Allow server to get up
reader, writer = await open_connection(*sockaddr)
await writer.awrite(line)
data = await reader.readline()
await writer.aclose()
result.append(data) # capture response

result = []
l.create_task(start_server(echo_server, *sockaddr))
l.run_until_complete(echo_client(b'Hello\r\n', result))

self.assertEqual(result[0], b'Hello\r\n')


if __name__ == '__main__':
main()
48 changes: 24 additions & 24 deletions uasyncio/uasyncio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,42 @@ def __init__(self):
self.poller = select.poll()
self.objmap = {}

def add_reader(self, fd, cb, *args):
def add_reader(self, sock, cb, *args):
if DEBUG and __debug__:
log.debug("add_reader%s", (fd, cb, args))
log.debug("add_reader%s", (sock, cb, args))
if args:
self.poller.register(fd, select.POLLIN)
self.objmap[fd] = (cb, args)
self.poller.register(sock, select.POLLIN)
self.objmap[id(sock)] = (cb, args)
else:
self.poller.register(fd, select.POLLIN)
self.objmap[fd] = cb
self.poller.register(sock, select.POLLIN)
self.objmap[id(sock)] = cb

def remove_reader(self, fd):
def remove_reader(self, sock):
if DEBUG and __debug__:
log.debug("remove_reader(%s)", fd)
self.poller.unregister(fd)
del self.objmap[fd]
log.debug("remove_reader(%s)", sock)
self.poller.unregister(sock)
del self.objmap[id(sock)]

def add_writer(self, fd, cb, *args):
def add_writer(self, sock, cb, *args):
if DEBUG and __debug__:
log.debug("add_writer%s", (fd, cb, args))
log.debug("add_writer%s", (sock, cb, args))
if args:
self.poller.register(fd, select.POLLOUT)
self.objmap[fd] = (cb, args)
self.poller.register(sock, select.POLLOUT)
self.objmap[id(sock)] = (cb, args)
else:
self.poller.register(fd, select.POLLOUT)
self.objmap[fd] = cb
self.poller.register(sock, select.POLLOUT)
self.objmap[id(sock)] = cb

def remove_writer(self, fd):
def remove_writer(self, sock):
if DEBUG and __debug__:
log.debug("remove_writer(%s)", fd)
log.debug("remove_writer(%s)", sock)
try:
self.poller.unregister(fd)
self.objmap.pop(fd, None)
self.poller.unregister(sock)
self.objmap.pop(id(sock), None)
except OSError as e:
# StreamWriter.awrite() first tries to write to an fd,
# StreamWriter.awrite() first tries to write to a socket,
# and if that succeeds, yield IOWrite may never be called
# for that fd, and it will never be added to poller. So,
# for that socket, and it will never be added to poller. So,
# ignore such error.
if e.args[0] != errno.ENOENT:
raise
Expand All @@ -63,8 +63,8 @@ def wait(self, delay):
# Remove "if res" workaround after
# https://github.com/micropython/micropython/issues/2716 fixed.
if res:
for fd, ev in res:
cb = self.objmap[fd]
for sock, ev in res:
cb = self.objmap[id(sock)]
if DEBUG and __debug__:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When fixing conflict, you dropped upstream change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for catching it! Didn't see it in the diffs somehow.

log.debug("Calling IO callback: %r", cb)
if isinstance(cb, tuple):
Expand Down