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

py: Improve stream_read so it doesn't need to alloc 2 bits of heap.

Browse Source
This commit is contained in:
Damien George 2014-10-17 23:34:06 +01:00
parent 297d8469b8
commit b7a4b0f86f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/stream.c
View File

@ -166,7 +166,8 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {
} }
#endif #endif
byte *buf = m_new(byte, sz); byte *buf;
mp_obj_t ret_obj = mp_obj_str_builder_start(STREAM_CONTENT_TYPE(o->type->stream_p), sz, &buf);
int error; int error;
mp_uint_t out_sz = o->type->stream_p->read(o, buf, sz, &error); mp_uint_t out_sz = o->type->stream_p->read(o, buf, sz, &error);
if (out_sz == MP_STREAM_ERROR) { if (out_sz == MP_STREAM_ERROR) {
@ -180,9 +181,7 @@ STATIC mp_obj_t stream_read(uint n_args, const mp_obj_t *args) {
} }
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
} else { } else {
mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), buf, out_sz); // will reallocate to use exact size return mp_obj_str_builder_end_with_len(ret_obj, out_sz);
m_free(buf, sz);
return s;
} }
} }