Skip to content

Commit ad9b9c7

Browse files
committed
py/stream: Implement 2- and 3-arg write() method as an extension to CPython.
3-arg form: stream.write(data, offset, length) 2-arg form: stream.write(data, length) These allow efficient buffer writing without incurring extra memory allocation for slicing or creating memoryview() object, what is important for low-memory ports. All arguments must be positional. It might be not so bad idea to standardize on 3-arg form, but 2-arg case would need check and raising an exception anyway then, so instead it was just made to work.
1 parent be313ea commit ad9b9c7

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

py/stream.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,24 @@ void mp_stream_write_adaptor(void *self, const char *buf, size_t len) {
267267
mp_stream_write(MP_OBJ_FROM_PTR(self), buf, len, MP_STREAM_RW_WRITE);
268268
}
269269

270-
STATIC mp_obj_t stream_write_method(mp_obj_t self_in, mp_obj_t arg) {
270+
STATIC mp_obj_t stream_write_method(size_t n_args, const mp_obj_t *args) {
271271
mp_buffer_info_t bufinfo;
272-
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
273-
return mp_stream_write(self_in, bufinfo.buf, bufinfo.len, MP_STREAM_RW_WRITE);
272+
mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
273+
size_t max_len = (size_t)-1;
274+
size_t off = 0;
275+
if (n_args == 3) {
276+
max_len = mp_obj_get_int_truncated(args[2]);
277+
} else if (n_args == 4) {
278+
off = mp_obj_get_int_truncated(args[2]);
279+
max_len = mp_obj_get_int_truncated(args[3]);
280+
if (off > bufinfo.len) {
281+
off = bufinfo.len;
282+
}
283+
}
284+
bufinfo.len -= off;
285+
return mp_stream_write(args[0], (byte*)bufinfo.buf + off, MIN(bufinfo.len, max_len), MP_STREAM_RW_WRITE);
274286
}
275-
MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write_obj, stream_write_method);
287+
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_write_obj, 2, 4, stream_write_method);
276288

277289
STATIC mp_obj_t stream_write1_method(mp_obj_t self_in, mp_obj_t arg) {
278290
mp_buffer_info_t bufinfo;

0 commit comments

Comments
 (0)