10000 host emulation: improve udp, persistent spiffs by d-a-v · Pull Request #5605 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

host emulation: improve udp, persistent spiffs #5605

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 15 commits into from
Jan 15, 2019
Merged

host emulation: improve udp, persistent spiffs #5605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a2bbb98
use newlib api in new mDNS, fix host using mDNS
d-a-v Dec 23, 2018
6d993b5
fix comparison
d-a-v Dec 25, 2018
88296f3
host: udp fixes (seek)
d-a-v Jan 8, 2019
cdbb75c
persistent spiffs + fixes
d-a-v Jan 9, 2019
6e09ce2
Merge branch 'master' into hostfix
d-a-v Jan 9, 2019
d220591
fix local CI tester
d-a-v Jan 9, 2019
c049f4a
restore commented macros
d-a-v Jan 9, 2019
ab2b37a
Merge branch 'hostfix' of github.com:d-a-v/Arduino into hostfix
d-a-v Jan 11, 2019
85138ea
host: spiffs: restore use of a vector, file name based on executable …
d-a-v Jan 11, 2019
4e2874e
host: propagate posix read/write errors
d-a-v Jan 11, 2019
98b2e81
don't use ::abort()
d-a-v Jan 11, 2019
ed864fe
Merge branch 'master' into hostfix
d-a-v Jan 11, 2019
0fdc280
Merge branch 'master' into hostfix
d-a-v Jan 11, 2019
bf0b994
extra check to avoid noise
d-a-v Jan 12, 2019
2603a4a
Merge branch 'hostfix' of github.com:d-a-v/Arduino into hostfix
d-a-v Jan 12, 2019
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
Prev Previous commit
Next Next commit
host: propagate posix read/write errors
  • Loading branch information
@d-a-v
d-a-v committed Jan 11, 2019
commit 4e2874e0b2a808cee75b1c0e22d190da99e51e2c
23 changes: 15 additions & 8 deletions tests/host/common/ClientContextSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,24 @@ int mockConnect (uint32_t ipv4, int& sock, int port)
return 1;
}

size_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize)
ssize_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize)
{
size_t maxread = CCBUFSIZE - ccinbufsize;
ssize_t ret = ::read(sock, ccinbuf + ccinbufsize, maxread);
if (ret == -1)
{
if (errno != EAGAIN)
{
fprintf(stderr, MOCK "ClientContext::(read/peek): filling buffer for %zd bytes: %s\n", maxread, strerror(errno));
return -1;
}
ret = 0;
}
return ccinbufsize += ret;
ccinbufsize += ret;
return ret;
}

size_t mockPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
ssize_t mockPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
{
if (usersize > CCBUFSIZE)
fprintf(stderr, MOCK "CCBUFSIZE(%d) should be increased by %zd bytes (-> %zd)\n", CCBUFSIZE, usersize - CCBUFSIZE, usersize);
Expand All @@ -96,7 +100,8 @@ size_t mockPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char
}

// check incoming data data
mockFillInBuf(sock, ccinbuf, ccinbufsize);
if (mockFillInBuf(sock, ccinbuf, ccinbufsize) < 0)
return -1;
if (usersize <= ccinbufsize)
{
// data just received
Expand All @@ -113,16 +118,18 @@ size_t mockPeekBytes (int sock, char* dst, size_t usersize, int timeout_ms, char
return retsize;
}

size_t mockRead (int sock, char* dst, size_t size, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
ssize_t mockRead (int sock, char* dst, size_t size, int timeout_ms, char* ccinbuf, size_t& ccinbufsize)
{
size_t copied = mockPeekBytes(sock, dst, size, timeout_ms, ccinbuf, ccinbufsize);
ssize_t copied = mockPeekBytes(sock, dst, size, timeout_ms, ccinbuf, ccinbufsize);
if (copied < 0)
return -1;
// swallow (XXX use a circular buffer)
memmove(ccinbuf, ccinbuf + copied, ccinbufsize - copied);
ccinbufsize -= copied;
return copied;
}

size_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms)
ssize_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms)
{
struct pollfd p;
p.fd = sock;
Expand All @@ -140,7 +147,7 @@ size_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms)
if (ret == -1)
{
fprintf(stderr, MOCK "ClientContext::read: write(%d): %s\n", sock, strerror(errno));
return 0;
return -1;
}
if (ret != (int)size)
{
Expand Down
18 changes: 15 additions & 3 deletions tests/host/common/include/ClientContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,13 @@ class ClientContext

size_t read (char* dst, size_t size)
{
return mockRead(_sock, dst, size, 0, _inbuf, _inbufsize);
ssize_t ret = mockRead(_sock, dst, size, 0, _inbuf, _inbufsize);
if (ret < 0)
{
abort(); // close, CLOSED
return 0;
}
return ret;
}

int peek()
Expand Down Expand Up @@ -198,7 +204,13 @@ class ClientContext

size_t write(const uint8_t* data, size_t size)
{
return mockWrite(_sock, data, size, _timeout_ms);
ssize_t ret = mockWrite(_sock, data, size, _timeout_ms);
if (ret < 0)
{
abort(); // close, CLOSED
return 0;
}
return ret;
}

size_t write(Stream& stream)
Expand All @@ -208,7 +220,7 @@ class ClientContext
avail = stream.readBytes(buf, avail);
size_t totwrote = 0;
uint8_t* w = buf;
while (avail)
while (avail && _sock >= 0)
{
size_t wrote = write(w, avail);
w += wrote;
Expand Down
10 changes: 5 additions & 5 deletions tests/host/common/mock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ extern uint32_t global_ipv4_netfmt; // selected interface addresse to bind to
#endif

// tcp
int mockConnect (uint32_t addr, int& sock, int port);
size_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize);
size_t mockPeekBytes (int sock, char* dst, size_t size, int timeout_ms, char* buf, size_t& bufsize);
size_t mockRead (int sock, char* dst, size_t size, int timeout_ms, char* buf, size_t& bufsize);
size_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms);
int mockConnect (uint32_t addr, int& sock, int port);
ssize_t mockFillInBuf (int sock, char* ccinbuf, size_t& ccinbufsize);
ssize_t mockPeekBytes (int sock, char* dst, size_t size, int timeout_ms, char* buf, size_t& bufsize);
ssize_t mockRead (int sock, char* dst, size_t size, int timeout_ms, char* buf, size_t& bufsize);
ssize_t mockWrite (int sock, const uint8_t* data, size_t size, int timeout_ms);
int serverAccept (int sock);

// udp
Expand Down
0