extmod/modwebsocket: Add option for blocking writes to non-blk sockets.

pfalcon · pfalcon · commit 5b1c22178565 · 2016-04-09T16:03:38.000+03:00
This is strange asymmetry which is sometimes needed, e.g. for WebREPL: we
want to process only available input and no more; but for output, we want
to get rid of all of it, because there's no other place to buffer/store
it. This asymmetry is akin to CPython's asyncio asymmetry, where reads are
asynchronous, but writes are synchronous (asyncio doesn't expect them to
block, instead expects there to be (unlimited) buffering for any sync write
to completely immediately).
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
@@ -37,6 +37,7 @@
 #if MICROPY_PY_WEBSOCKET
 
 enum { FRAME_HEADER, FRAME_OPT, PAYLOAD };
+enum { BLOCKING_WRITE = 1 };
 
 typedef struct _mp_obj_websocket_t {
     mp_obj_base_t base;
@@ -48,17 +49,22 @@ typedef struct _mp_obj_websocket_t {
     byte mask_pos;
     byte buf_pos;
     byte buf[6];
+    byte opts;
 } mp_obj_websocket_t;
 
 STATIC mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+    mp_arg_check_num(n_args, n_kw, 1, 2, false);
     mp_obj_websocket_t *o = m_new_obj(mp_obj_websocket_t);
     o->base.type = type;
     o->sock = args[0];
     o->state = FRAME_HEADER;
     o->to_recv = 2;
     o->mask_pos = 0;
     o->buf_pos = 0;
+    o->opts = 0;
+    if (n_args > 1 && args[1] == mp_const_true) {
+        o->opts |= BLOCKING_WRITE;
+    }
     return o;
 }
 
@@ -157,11 +163,24 @@ STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t si
     assert(size < 126);
     byte header[] = {0x81, size};
 
+    mp_obj_t dest[3];
+    if (self->opts & BLOCKING_WRITE) {
+        mp_load_method(self->sock, MP_QSTR_setblocking, dest);
+        dest[2] = mp_const_true;
+        mp_call_method_n_kw(1, 0, dest);
+    }
+
     mp_uint_t out_sz = mp_stream_writeall(self->sock, header, sizeof(header), errcode);
-    if (out_sz == MP_STREAM_ERROR) {
-        return MP_STREAM_ERROR;
+    if (out_sz != MP_STREAM_ERROR) {
+        out_sz = mp_stream_writeall(self->sock, buf, size, errcode);
     }
-    return mp_stream_writeall(self->sock, buf, size, errcode);
+
+    if (self->opts & BLOCKING_WRITE) {
+        dest[2] = mp_const_false;
+        mp_call_method_n_kw(1, 0, dest);
+    }
+
+    return out_sz;
 }
 
 STATIC const mp_map_elem_t websocket_locals_dict_table[] = {
