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

Merge pull request #4022 from iot49/cp-msgpack

Browse Source 
msgpack updates: handle exttype & chunk long reads
This commit is contained in:
Scott Shawcroft 2021-01-19 18:39:57 -08:00 committed by GitHub
commit 54e2f85c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shared-module/msgpack/__init__.c
View File

@ -255,11 +255,6 @@ STATIC void pack(mp_obj_t obj, msgpack_stream_t *s, mp_obj_t default_handler) {
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(ext->data, &bufinfo, MP_BUFFER_READ); mp_get_buffer_raise(ext->data, &bufinfo, MP_BUFFER_READ);
pack_ext(s, ext->code, bufinfo.buf, bufinfo.len); pack_ext(s, ext->code, bufinfo.buf, bufinfo.len);
} else if (MP_OBJ_IS_TYPE(obj, &mp_type_bytes)) {
// bytes
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
pack_bin(s, bufinfo.buf, bufinfo.len);
} else if (MP_OBJ_IS_TYPE(obj, &mp_type_tuple)) { } else if (MP_OBJ_IS_TYPE(obj, &mp_type_tuple)) {
// tuple // tuple
mp_obj_tuple_t *self = MP_OBJ_TO_PTR(obj); mp_obj_tuple_t *self = MP_OBJ_TO_PTR(obj);
@ -297,7 +292,11 @@ STATIC void pack(mp_obj_t obj, msgpack_stream_t *s, mp_obj_t default_handler) {
} else if (obj == mp_const_true) { } else if (obj == mp_const_true) {
write1(s, 0xc3); write1(s, 0xc3);
} else { } else {
if (default_handler != mp_const_none) { mp_buffer_info_t bufinfo;
if (mp_get_buffer(obj, &bufinfo, MP_BUFFER_READ)) {
// bytes (bin type)
pack_bin(s, bufinfo.buf, bufinfo.len);
} else if (default_handler != mp_const_none) {
// set default_handler to mp_const_none to avoid infinite recursion // set default_handler to mp_const_none to avoid infinite recursion
// this also precludes some valid outputs // this also precludes some valid outputs
pack(mp_call_function_1(default_handler, obj), s, mp_const_none); pack(mp_call_function_1(default_handler, obj), s, mp_const_none);
@ -332,7 +331,15 @@ STATIC mp_obj_t unpack_bytes(msgpack_stream_t *s, size_t size) {
vstr_t vstr; vstr_t vstr;
vstr_init_len(&vstr, size); vstr_init_len(&vstr, size);
byte *p = (byte*)vstr.buf; byte *p = (byte*)vstr.buf;
read(s, p, size); // read in chunks: (some drivers - e.g. UART) limit the
// maximum number of bytes that can be read at once
// read(s, p, size);
while (size > 0) {
int n = size > 256 ? 256 : size;
read(s, p, n);
size -= n;
p += n;
}
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
} }