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

zephyr/modusocket: Refactor send() into stream write() method.

Browse Source
This commit is contained in:
Paul Sokolovsky 2017-04-26 01:05:54 +03:00
parent 083cd21a74
commit 0e177e0649
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
zephyr/modusocket.c
View File

@ -28,6 +28,7 @@
#ifdef MICROPY_PY_USOCKET #ifdef MICROPY_PY_USOCKET
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h"
#include <stdio.h> #include <stdio.h>
#include <zephyr.h> #include <zephyr.h>
@ -300,29 +301,44 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept); STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) { STATIC mp_uint_t sock_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
socket_obj_t *socket = self_in; socket_obj_t *socket = self_in;
socket_check_closed(socket); if (socket->ctx == NULL) {
// already closed
mp_buffer_info_t bufinfo; *errcode = EBADF;
mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ); return MP_STREAM_ERROR;
}
struct net_buf *send_buf = net_nbuf_get_tx(socket->ctx, K_FOREVER); struct net_buf *send_buf = net_nbuf_get_tx(socket->ctx, K_FOREVER);
unsigned len = net_if_get_mtu(net_context_get_iface(socket->ctx)); unsigned len = net_if_get_mtu(net_context_get_iface(socket->ctx));
// Arbitrary value to account for protocol headers // Arbitrary value to account for protocol headers
len -= 64; len -= 64;
if (len > bufinfo.len) { if (len > size) {
len = bufinfo.len; len = size;
} }
if (!net_nbuf_append(send_buf, len, bufinfo.buf, K_FOREVER)) { if (!net_nbuf_append(send_buf, len, buf, K_FOREVER)) {
len = net_buf_frags_len(send_buf); len = net_buf_frags_len(send_buf);
//mp_raise_OSError(ENOSPC);
} }
RAISE_ERRNO(net_context_send(send_buf, /*cb*/NULL, K_FOREVER, NULL, NULL)); int err = net_context_send(send_buf, /*cb*/NULL, K_FOREVER, NULL, NULL);
if (err < 0) {
*errcode = -err;
return MP_STREAM_ERROR;
}
return len;
}
STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
int err = 0;
mp_uint_t len = sock_write(self_in, bufinfo.buf, bufinfo.len, &err);
if (len == MP_STREAM_ERROR) {
mp_raise_OSError(err);
}
return mp_obj_new_int_from_uint(len); return mp_obj_new_int_from_uint(len);
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send); STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
@ -436,12 +452,18 @@ STATIC const mp_map_elem_t socket_locals_dict_table[] = {
}; };
STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table); STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
STATIC const mp_stream_p_t socket_stream_p = {
//.read = sock_read,
.write = sock_write,
//.ioctl = sock_ioctl,
};
STATIC const mp_obj_type_t socket_type = { STATIC const mp_obj_type_t socket_type = {
{ &mp_type_type }, { &mp_type_type },
.name = MP_QSTR_socket, .name = MP_QSTR_socket,
.print = socket_print, .print = socket_print,
.make_new = socket_make_new, .make_new = socket_make_new,
//.protocol = &socket_stream_p, .protocol = &socket_stream_p,
.locals_dict = (mp_obj_t)&socket_locals_dict, .locals_dict = (mp_obj_t)&socket_locals_dict,
}; };