ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9520 from VeijoPesonen/bugfix-esp8266_reduce_sigio 

ESP8266: reduces SIGIO signaled to the upper layers
pull/9581/head
Martin Kojtal 2019-02-01 08:23:35 +01:00 committed by GitHub
parent 7ba83a517d 53c2879a5c
commit f1bf5dbd63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/wifi/esp8266-driver/ESP8266Interface.cpp
View File

@ -26,9 +26,9 @@
#include "features/netsocket/nsapi_types.h"
#include "mbed_trace.h"
#include "platform/Callback.h"
#include "platform/mbed_critical.h"
#include "platform/mbed_debug.h"
#include "platform/mbed_wait_api.h"
#include "Kernel.h"
#ifndef MBED_CONF_ESP8266_DEBUG
#define MBED_CONF_ESP8266_DEBUG false
@ -495,6 +495,10 @@ int ESP8266Interface::socket_close(void *handle)
err = NSAPI_ERROR_DEVICE_ERROR;
}
_cbs[socket->id].callback = NULL;
_cbs[socket->id].data = NULL;
core_util_atomic_store_u8(&_cbs[socket->id].deferred, false);
socket->connected = false;
_sock_i[socket->id].open = false;
_sock_i[socket->id].sport = 0;
@ -563,6 +567,7 @@ int ESP8266Interface::socket_send(void *handle, const void *data, unsigned size)
{
nsapi_error_t status;
struct esp8266_socket *socket = (struct esp8266_socket *)handle;
uint8_t expect_false = false;
if (!socket) {
return NSAPI_ERROR_NO_SOCKET;
@ -573,15 +578,13 @@ int ESP8266Interface::socket_send(void *handle, const void *data, unsigned size)
return socket->proto == NSAPI_TCP ? 0 : NSAPI_ERROR_UNSUPPORTED;
}
unsigned long int sendStartTime = rtos::Kernel::get_ms_count();
do {
status = _esp.send(socket->id, data, size);
} while ((sendStartTime - rtos::Kernel::get_ms_count() < 50)
&& (status != NSAPI_ERROR_OK));
status = _esp.send(socket->id, data, size);
if (status == NSAPI_ERROR_WOULD_BLOCK && socket->proto == NSAPI_TCP) {
tr_debug("ESP8266Interface::socket_send(): enqueuing the event call");
_global_event_queue->call_in(100, callback(this, &ESP8266Interface::event));
if (status == NSAPI_ERROR_WOULD_BLOCK
&& socket->proto == NSAPI_TCP
&& core_util_atomic_cas_u8(&_cbs[socket->id].deferred, &expect_false, true)) {
tr_debug("Postponing SIGIO from the device");
_global_event_queue->call_in(50, callback(this, &ESP8266Interface::event_deferred));
} else if (status == NSAPI_ERROR_WOULD_BLOCK && socket->proto == NSAPI_UDP) {
status = NSAPI_ERROR_DEVICE_ERROR;
}
@ -731,6 +734,16 @@ void ESP8266Interface::event()
}
}
void ESP8266Interface::event_deferred()
{
for (int i = 0; i < ESP8266_SOCKET_COUNT; i++) {
uint8_t expect_true = true;
if (core_util_atomic_cas_u8(&_cbs[i].deferred, &expect_true, false) && _cbs[i].callback) {
_cbs[i].callback(_cbs[i].data);
}
}
}
void ESP8266Interface::attach(Callback<void(nsapi_event_t, intptr_t)> status_cb)
{
_conn_stat_cb = status_cb;

2
components/wifi/esp8266-driver/ESP8266Interface.h
View File

@ -373,8 +373,10 @@ private:
struct {
void (*callback)(void *);
void *data;
uint8_t deferred;
} _cbs[ESP8266_SOCKET_COUNT];
void event();
void event_deferred();
// Connection state reporting to application
nsapi_connection_status_t _conn_stat;