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

pfalcon · pfalcon · commit f41e1f1bb7c9 · 2016-04-29T01:05:02.000+03:00
EAGAIN should be returned only if underlying socket returned it. Wrap
existing read function into external loop to process all data available.
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
@@ -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,17 +181,15 @@ 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;
             }
         }
 
         DEBUG_printf("webrepl: op: %d, file: %s, chunk @%x, sz=%d\n", self->hdr.type, self->hdr.fname, (uint32_t)self->hdr.offset, self->hdr.size);
 
         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) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,17 @@ STATIC void handle_op(mp_obj_webrepl_t *self) {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
	`147`	`+STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void buf, mp_uint_t size, int errcode);`
	`148`	`+`
`147`	`149`	`STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void buf, mp_uint_t size, int errcode) {`
	`150`	`+ mp_uint_t out_sz;`
	`151`	`+ do {`
	`152`	`+ out_sz = _webrepl_read(self_in, buf, size, errcode);`
	`153`	`+ } while (out_sz == -2);`
	`154`	`+ return out_sz;`
	`155`	`+}`
	`156`	`+`
	`157`	`+STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void buf, mp_uint_t size, int errcode) {`
`148`	`158`	`// We know that os.dupterm always calls with size = 1`
`149`	`159`	`assert(size == 1);`
`150`	`160`	`mp_obj_webrepl_t *self = self_in;`
`@@ -171,17 +181,15 @@ STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void buf, mp_uint_t size, int `
`171`	`181`	`}`
`172`	`182`	`self->hdr_to_recv -= hdr_sz;`
`173`	`183`	`if (self->hdr_to_recv != 0) {`
`174`		`- *errcode = EAGAIN;`
`175`		`- return MP_STREAM_ERROR;`
	`184`	`+ return -2;`
`176`	`185`	`}`
`177`	`186`	`}`
`178`	`187`
`179`	`188`	`DEBUG_printf("webrepl: op: %d, file: %s, chunk @%x, sz=%d\n", self->hdr.type, self->hdr.fname, (uint32_t)self->hdr.offset, self->hdr.size);`
`180`	`189`
`181`	`190`	`handle_op(self);`
`182`	`191`
`183`		`- *errcode = EAGAIN;`
`184`		`- return MP_STREAM_ERROR;`
	`192`	`+ return -2;`
`185`	`193`	`}`
`186`	`194`
`187`	`195`	`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 `
`213`	`221`	`}`
`214`	`222`	`}`
`215`	`223`
`216`		`- *errcode = EAGAIN;`
`217`		`- return MP_STREAM_ERROR;`
	`224`	`+ return -2;`
`218`	`225`	`}`
`219`	`226`
`220`	`227`	`STATIC mp_uint_t webrepl_write(mp_obj_t self_in, const void buf, mp_uint_t size, int errcode) {`