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

Fix idiosyncratic non-blocking behaviour in C027

Christopher Haster 2016-05-17 02:48:47 -05:00
parent a878b60a0a
commit 88293b54f1
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/C027Interface/C027Interface.cpp
View File

@ -96,19 +96,15 @@ struct c027_socket {
}; };
static void socket_poll(struct c027_socket *socket) { static void socket_poll(struct c027_socket *socket) {
bool was_readable = false;
while (socket->running) { while (socket->running) {
socket->mutex.lock(); socket->mutex.lock();
bool is_readable = !!socket->mdm->socketReadable(socket->socket); if (socket->mdm->socketReadable(socket->socket)) {
if (is_readable != was_readable) {
if (socket->callback) { if (socket->callback) {
socket->callback(socket->data); socket->callback(socket->data);
} }
was_readable = is_readable;
} }
socket->mutex.unlock(); socket->mutex.unlock();
Thread::yield();
} }
} }
@ -166,6 +162,9 @@ int C027Interface::socket_connect(void *handle, const SocketAddress &addr)
socket->mutex.lock(); socket->mutex.lock();
bool success = _mdm->socketConnect(socket->socket, addr.get_ip_address(), addr.get_port()); bool success = _mdm->socketConnect(socket->socket, addr.get_ip_address(), addr.get_port());
if (socket->callback) {
socket->callback(socket->data);
}
socket->mutex.unlock(); socket->mutex.unlock();
if (!success) { if (!success) {
@ -186,6 +185,10 @@ int C027Interface::socket_send(void *handle, const void *data, unsigned size)
socket->mutex.lock(); socket->mutex.lock();
int sent = _mdm->socketSend(socket->socket, (const char *)data, size); int sent = _mdm->socketSend(socket->socket, (const char *)data, size);
if (socket->callback) {
socket->callback(socket->data);
}
socket->mutex.unlock(); socket->mutex.unlock();
if (sent == SOCKET_ERROR) { if (sent == SOCKET_ERROR) {
@ -212,6 +215,10 @@ int C027Interface::socket_recv(void *handle, void *data, unsigned size)
return NSAPI_ERROR_DEVICE_ERROR; return NSAPI_ERROR_DEVICE_ERROR;
} }
if (recv == 0) {
return NSAPI_ERROR_WOULD_BLOCK;
}
return recv; return recv;
} }
@ -223,6 +230,10 @@ int C027Interface::socket_sendto(void *handle, const SocketAddress &addr, const
int sent = _mdm->socketSendTo(socket->socket, int sent = _mdm->socketSendTo(socket->socket,
*(MDMParser::IP *)addr.get_ip_bytes(), addr.get_port(), *(MDMParser::IP *)addr.get_ip_bytes(), addr.get_port(),
(const char *)data, size); (const char *)data, size);
if (socket->callback) {
socket->callback(socket->data);
}
socket->mutex.unlock(); socket->mutex.unlock();
if (sent == SOCKET_ERROR) { if (sent == SOCKET_ERROR) {
@ -252,6 +263,10 @@ int C027Interface::socket_recvfrom(void *handle, SocketAddress *addr, void *data
return NSAPI_ERROR_DEVICE_ERROR; return NSAPI_ERROR_DEVICE_ERROR;
} }
if (recv == 0) {
return NSAPI_ERROR_WOULD_BLOCK;
}
if (addr) { if (addr) {
addr->set_ip_bytes(&ip, NSAPI_IPv4); addr->set_ip_bytes(&ip, NSAPI_IPv4);
addr->set_port(port); addr->set_port(port);