Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SocketWrapper MbedClient debugging readSocket #912

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −9
Open

SocketWrapper MbedClient debugging readSocket #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions libraries/SocketWrapper/src/MbedClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,30 @@ void arduino::MbedClient::readSocket() {
int ret = NSAPI_ERROR_WOULD_BLOCK;
do {
JAndrassy marked this conversation as resolved.
Show resolved Hide resolved
mutex->lock();
if (sock != nullptr && rxBuffer.availableForStore() == 0) {
if (sock == nullptr) {
Copy link

@schnoberts1 schnoberts1 Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this subject to the same issues as "Another racy example" here: https://queue.acm.org/detail.cfm?id=2088916? sock is loop invariant but changed in another thread. mutex is the same isn't it?

mutex->unlock();
goto cleanup;
}
if (rxBuffer.availableForStore() == 0) {
mutex->unlock();
yield();
continue;
} else if (sock == nullptr) {
goto cleanup;
}
ret = sock->recv(data, rxBuffer.availableForStore());
if (ret < 0 && ret != NSAPI_ERROR_WOULD_BLOCK) {
mutex->unlock();
goto cleanup;
}
if (ret == NSAPI_ERROR_WOULD_BLOCK || ret == 0) {
yield();
mutex->unlock();
continue;
break;
}
for (int i = 0; i < ret; i++) {
rxBuffer.store_char(data[i]);
}
mutex->unlock();
_status = true;
} while (ret == NSAPI_ERROR_WOULD_BLOCK || ret > 0);
} while (true);
}
cleanup:
_status = false;
Expand Down Expand Up @@ -98,6 +100,7 @@ int arduino::MbedClient::connect(SocketAddress socketAddress) {
}

if (static_cast<TCPSocket *>(sock)->open(getNetwork()) != NSAPI_ERROR_OK) {
_status = false;
return 0;
}

Expand All @@ -117,6 +120,7 @@ int arduino::MbedClient::connect(SocketAddress socketAddress) {
configureSocket(sock);
_status = true;
} else {
sock->close();
_status = false;
}

Expand Down Expand Up @@ -148,6 +152,7 @@ int arduino::MbedClient::connectSSL(SocketAddress socketAddress) {
}

if (static_cast<TLSSocket *>(sock)->open(getNetwork()) != NSAPI_ERROR_OK) {
_status = false;
return 0;
}

Expand Down Expand Up @@ -179,6 +184,7 @@ int arduino::MbedClient::connectSSL(SocketAddress socketAddress) {
configureSocket(sock);
_status = true;
} else {
sock->close();
_status = false;
}

Expand Down Expand Up @@ -224,8 +230,9 @@ int arduino::MbedClient::available() {
}

int arduino::MbedClient::read() {
if (sock == nullptr)
if (mutex == nullptr) {
return -1;
}
mutex->lock();
if (!available()) {
mutex->unlock();
Expand All @@ -238,8 +245,9 @@ int arduino::MbedClient::read() {
}

int arduino::MbedClient::read(uint8_t *data, size_t len) {
if (sock == nullptr)
if (mutex == nullptr) {
return 0;
}
mutex->lock();
int avail = available();

Expand All @@ -261,7 +269,14 @@ int arduino::MbedClient::read(uint8_t *data, size_t len) {
}

int arduino::MbedClient::peek() {
return rxBuffer.peek();
if (mutex == nullptr) {
return 0;
}
mutex->lock();
int res = rxBuffer.peek();
mutex->unlock();

return res;
}

void arduino::MbedClient::flush() {
Expand Down
Loading