Jun 29, 2024 · Sep 9, 2024
diff --git a/libraries/SocketWrapper/src/MbedClient.cpp b/libraries/SocketWrapper/src/MbedClient.cpp
    int ret = NSAPI_ERROR_WOULD_BLOCK;
    do {
      mutex->lock();
      if (sock != nullptr && rxBuffer.availableForStore() == 0) {
      if (sock == nullptr) {
        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;
  }

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

    configureSocket(sock);
    _status = true;
  } else {
    sock->close();
    _status = false;
  }

  }

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

    configureSocket(sock);
    _status = true;
  } else {
    sock->close();
    _status = false;
  }

 }

 int arduino::MbedClient::read() {
  if (sock == nullptr)
  if (mutex == nullptr) {
    return -1;
  }
  mutex->lock();
  if (!available()) {
    mutex->unlock();
 }

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

 }

 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() {
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 resolvedHide resolved
		mutex->lock();
		if (sock != nullptr && rxBuffer.availableForStore() == 0) {
		if (sock == nullptr) {
Copy link schnoberts1Sep 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 DownExpand 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 DownExpand 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 DownExpand Up		@@ -179,6 +184,7 @@ int arduino::MbedClient::connectSSL(SocketAddress socketAddress) {
		configureSocket(sock);
		_status = true;
		} else {
		sock->close();
		_status = false;
		}

Expand DownExpand 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