djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/modwebrepl: Keep reading data when there's something to read.

Browse Source 
EAGAIN should be returned only if underlying socket returned it. Wrap
existing read function into external loop to process all data available.
This commit is contained in:
Paul Sokolovsky 2016-04-29 01:05:02 +03:00
parent 6514ff6160
commit f41e1f1bb7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extmod/modwebrepl.c
View File

@ -144,7 +144,17 @@ STATIC void handle_op(mp_obj_webrepl_t *self) {
}
}
STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode);
STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
mp_uint_t out_sz;
do {
out_sz = _webrepl_read(self_in, buf, size, errcode);
} while (out_sz == -2);
return out_sz;
}
STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
// We know that os.dupterm always calls with size = 1
assert(size == 1);
mp_obj_webrepl_t *self = self_in;
@ -171,8 +181,7 @@ STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *
}
self->hdr_to_recv -= hdr_sz;
if (self->hdr_to_recv != 0) {
*errcode = EAGAIN;
return MP_STREAM_ERROR;
return -2;
}
}
@ -180,8 +189,7 @@ STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *
handle_op(self);
*errcode = EAGAIN;
return MP_STREAM_ERROR;
return -2;
}
if (self->data_to_recv != 0) {
@ -213,8 +221,7 @@ STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *
}
}
*errcode = EAGAIN;
return MP_STREAM_ERROR;
return -2;
}
STATIC mp_uint_t webrepl_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {