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

pfalcon · pfalcon · commit e5b047369b74 · 2016-03-11T09:32:07.000+07:00
Instead of just delaying 100ms if event isn't yet ready.

So far applies only to default, "infinite" socket timeout.
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -211,8 +211,11 @@ typedef struct _lwip_socket_obj_t {
 } lwip_socket_obj_t;
 
 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);
+#endif
 }
 
 /*******************************************************************************/
@@ -348,7 +351,7 @@ STATIC mp_uint_t lwip_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
             }
         } else {
             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 {
             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 {
                 while (socket->state == STATE_CONNECTING) {
-                    mp_hal_delay_ms(100);
+                    poll_sockets();
                 }
             }
             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: {
             while(!lwip_dns_returned) {
-                mp_hal_delay_ms(100);
+                poll_sockets();
             }
             if (lwip_dns_returned == 2) {
                 nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOENT)));

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,11 @@ typedef struct _lwip_socket_obj_t {`
`211`	`211`	`} lwip_socket_obj_t;`
`212`	`212`
`213`	`213`	`static inline void poll_sockets(void) {`
`214`		`- // TODO: Allow to override by ports`
	`214`	`+#ifdef MICROPY_EVENT_POLL_HOOK`
	`215`	`+ MICROPY_EVENT_POLL_HOOK;`
	`216`	`+#else`
`215`	`217`	`mp_hal_delay_ms(1);`
	`218`	`+#endif`
`216`	`219`	`}`
`217`	`220`
`218`	`221`	`/*******************************************************************************/`
`@@ -348,7 +351,7 @@ STATIC mp_uint_t lwip_udp_receive(lwip_socket_obj_t socket, byte buf, mp_uint_`
`348`	`351`	`}`
`349`	`352`	`} else {`
`350`	`353`	`while (socket->incoming.pbuf == NULL) {`
`351`		`- mp_hal_delay_ms(100);`
	`354`	`+ poll_sockets();`
`352`	`355`	`}`
`353`	`356`	`}`
`354`	`357`	`}`
`@@ -605,7 +608,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {`
`605`	`608`	`}`
`606`	`609`	`} else {`
`607`	`610`	`while (socket->incoming.connection == NULL) {`
`608`		`- mp_hal_delay_ms(100);`
	`611`	`+ poll_sockets();`
`609`	`612`	`}`
`610`	`613`	`}`
`611`	`614`	`}`
`@@ -688,7 +691,7 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {`
`688`	`691`	`}`
`689`	`692`	`} else {`
`690`	`693`	`while (socket->state == STATE_CONNECTING) {`
`691`		`- mp_hal_delay_ms(100);`
	`694`	`+ poll_sockets();`
`692`	`695`	`}`
`693`	`696`	`}`
`694`	`697`	`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) {`
`1011`	`1014`	`}`
`1012`	`1015`	`case ERR_INPROGRESS: {`
`1013`	`1016`	`while(!lwip_dns_returned) {`
`1014`		`- mp_hal_delay_ms(100);`
	`1017`	`+ poll_sockets();`
`1015`	`1018`	`}`
`1016`	`1019`	`if (lwip_dns_returned == 2) {`
`1017`	`1020`	`nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOENT)));`