mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

extmod/modlwip: Use MICROPY_EVENT_POLL_HOOK for event polling if defined. 

Instead of just delaying 100ms if event isn't yet ready.

So far applies only to default, "infinite" socket timeout.
pull/1879/merge
Paul Sokolovsky 2015-12-28 18:58:14 +02:00
rodzic 54fc247f9b
commit e5b047369b
1 zmienionych plików z 8 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
extmod/modlwip.c
Wyświetl plik

@ -211,8 +211,11 @@ typedef struct _lwip_socket_obj_t {
} lwip_socket_obj_t; } lwip_socket_obj_t;
static inline void poll_sockets(void) { static inline void poll_sockets(void) {
// TODO: Allow to override by ports #ifdef MICROPY_EVENT_POLL_HOOK
MICROPY_EVENT_POLL_HOOK;
#else
mp_hal_delay_ms(1); mp_hal_delay_ms(1);
#endif
} }
/*******************************************************************************/ /*******************************************************************************/
@ -348,7 +351,7 @@ STATIC mp_uint_t lwip_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
} }
} else { } else {
while (socket->incoming.pbuf == NULL) { while (socket->incoming.pbuf == NULL) {
mp_hal_delay_ms(100); poll_sockets();
} }
} }
} }
@ -605,7 +608,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
} }
} else { } else {
while (socket->incoming.connection == NULL) { while (socket->incoming.connection == NULL) {
mp_hal_delay_ms(100); poll_sockets();
} }
} }
} }
@ -688,7 +691,7 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
} }
} else { } else {
while (socket->state == STATE_CONNECTING) { while (socket->state == STATE_CONNECTING) {
mp_hal_delay_ms(100); poll_sockets();
} }
} }
if (socket->state == STATE_CONNECTED) { if (socket->state == STATE_CONNECTED) {
@ -1011,7 +1014,7 @@ STATIC mp_obj_t lwip_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
} }
case ERR_INPROGRESS: { case ERR_INPROGRESS: {
while(!lwip_dns_returned) { while(!lwip_dns_returned) {
mp_hal_delay_ms(100); poll_sockets();
} }
if (lwip_dns_returned == 2) { if (lwip_dns_returned == 2) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOENT))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOENT)));