Add socket buffer layer to increase read performance

Author: sandeepmistry

src/WiFiClient.cpp

@@ -25,12 +25,13 @@ extern "C" {
   #include "utility/debug.h"
 }
 
-#include "WiFi.h"
-#include "WiFiClient.h"
-#include "WiFiServer.h"
+
 #include "utility/server_drv.h"
 #include "utility/wifi_drv.h"
+#include "utility/WiFiSocketBuffer.h"
 
+#include "WiFi.h"
+#include "WiFiClient.h"
 
 uint16_t WiFiClient::_srcport = 1024;
 
@@ -50,6 +51,11 @@ int WiFiClient::connect(const char* host, uint16_t port) {
 }
 
 int WiFiClient::connect(IPAddress ip, uint16_t port) {
+    if (_sock != NO_SOCKET_AVAIL)
+    {
+      stop();
+    }
+
     _sock = ServerDrv::getSocket();
     if (_sock != NO_SOCKET_AVAIL)
     {
@@ -74,6 +80,11 @@ int WiFiClient::connect(IPAddress ip, uint16_t port) {
 
 int WiFiClient::connectSSL(IPAddress ip, uint16_t port)
 {
+    if (_sock != NO_SOCKET_AVAIL)
+    {
+      stop();
+    }
+
     _sock = ServerDrv::getSocket();
     if (_sock != NO_SOCKET_AVAIL)
     {
@@ -125,7 +136,7 @@ size_t WiFiClient::write(uint8_t b) {
 }
 
 size_t WiFiClient::write(const uint8_t *buf, size_t size) {
-  if (_sock >= WIFI_MAX_SOCK_NUM)
+  if (_sock == NO_SOCKET_AVAIL)
   {
 	  setWriteError();
 	  return 0;
@@ -154,38 +165,32 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size) {
 int WiFiClient::available() {
   if (_sock != 255)
   {
-      return ServerDrv::availData(_sock);
+      return WiFiSocketBuffer.available(_sock);
   }
 
   return 0;
 }
 
 int WiFiClient::read() {
-  uint8_t b;
   if (!available())
+  {
     return -1;
+  }
+
+  uint8_t b;
+
+  WiFiSocketBuffer.read(_sock, &b, sizeof(b));
 
-  ServerDrv::getData(_sock, &b);
   return b;
 }
 
 
 int WiFiClient::read(uint8_t* buf, size_t size) {
-  // sizeof(size_t) is architecture dependent
-  // but we need a 16 bit data type here
-  uint16_t _size = size;
-  if (!ServerDrv::getDataBuf(_sock, buf, &_size))
-      return -1;
-  return _size;
+  return  WiFiSocketBuffer.read(_sock, buf, size);
 }
 
 int WiFiClient::peek() {
-	  uint8_t b;
-	  if (!available())
-	    return -1;
-
-	  ServerDrv::getData(_sock, &b, 1);
-	  return b;
+  return WiFiSocketBuffer.peek(_sock);
 }
 
 void WiFiClient::flush() {
@@ -204,20 +209,30 @@ void WiFiClient::stop() {
   while (status() != CLOSED && ++count < 50)
     delay(100);
 
+  WiFiSocketBuffer.close(_sock);
   _sock = 255;
 }
 
 uint8_t WiFiClient::connected() {
 
   if (_sock == 255) {
     return 0;
+  } else if (available()) {
+    return 1;
   } else {
     uint8_t s = status();
 
-    return !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 ||
-    		s == FIN_WAIT_2 || s == TIME_WAIT ||
-    		s == SYN_SENT || s== SYN_RCVD ||
-    		(s == CLOSE_WAIT));
+    uint8_t result =  !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 ||
+                      s == FIN_WAIT_2 || s == TIME_WAIT ||
+                      s == SYN_SENT || s== SYN_RCVD ||
+                      (s == CLOSE_WAIT));
+
+    if (result == 0) {
+      WiFiSocketBuffer.close(_sock);
+      _sock = 255;
+    }
+
+    return result;
   }
 }
 

src/WiFiUdp.cpp

@@ -18,13 +18,16 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <string.h>
+
 extern "C" {
   #include "utility/debug.h"
   #include "utility/wifi_spi.h"
 }
-#include <string.h>
+
 #include "utility/server_drv.h"
 #include "utility/wifi_drv.h"
+#include "utility/WiFiSocketBuffer.h"
 
 #include "WiFi.h"
 #include "WiFiUdp.h"
@@ -33,30 +36,40 @@ extern "C" {
 
 
 /* Constructor */
-WiFiUDP::WiFiUDP() : _sock(NO_SOCKET_AVAIL) {}
+WiFiUDP::WiFiUDP() : _sock(NO_SOCKET_AVAIL), _parsed(0) {}
 
 /* Start WiFiUDP socket, listening at local port PORT */
 uint8_t WiFiUDP::begin(uint16_t port) {
+    if (_sock != NO_SOCKET_AVAIL)
+    {
+        stop();
+    }
 
     uint8_t sock = ServerDrv::getSocket();
     if (sock != NO_SOCKET_AVAIL)
     {
         ServerDrv::startServer(port, sock, UDP_MODE);
         _sock = sock;
         _port = port;
+        _parsed = 0;
         return 1;
     }
     return 0;
 }
 
 uint8_t WiFiUDP::beginMulticast(IPAddress ip, uint16_t port) {
+    if (_sock != NO_SOCKET_AVAIL)
+    {
+        stop();
+    }
 
     uint8_t sock = ServerDrv::getSocket();
     if (sock != NO_SOCKET_AVAIL)
     {
         ServerDrv::startServer(ip, port, sock, UDP_MULTICAST_MODE);
         _sock = sock;
         _port = port;
+        _parsed = 0;
         return 1;
     }
     return 0;
@@ -65,11 +78,7 @@ uint8_t WiFiUDP::beginMulticast(IPAddress ip, uint16_t port) {
 /* return number of bytes available in the current packet,
    will return zero if parsePacket hasn't been called yet */
 int WiFiUDP::available() {
-	 if (_sock != NO_SOCKET_AVAIL)
-	 {
-	      return ServerDrv::availData(_sock);
-	 }
-	 return 0;
+	 return _parsed;
 }
 
 /* Release any resources being used by this WiFiUDP instance */
@@ -80,6 +89,7 @@ void WiFiUDP::stop()
 
 	  ServerDrv::stopClient(_sock);
 
+	  WiFiSocketBuffer.close(_sock);
 	  _sock = NO_SOCKET_AVAIL;
 }
 
@@ -125,42 +135,59 @@ size_t WiFiUDP::write(const uint8_t *buffer, size_t size)
 
 int WiFiUDP::parsePacket()
 {
-	return available();
+	while (_parsed--)
+	{
+	  // discard previously parsed packet data
+	  uint8_t b;
+
+	  WiFiSocketBuffer.read(_sock, &b, sizeof(b));
+	}
+
+	_parsed = ServerDrv::availData(_sock);
+
+	return _parsed;
 }
 
 int WiFiUDP::read()
 {
-  uint8_t b;
-  if (available())
+  if (_parsed < 1)
   {
-	  ServerDrv::getData(_sock, &b);
-  	  return b;
-  }else{
-	  return -1;
+    return -1;
   }
+
+  uint8_t b;
+
+  WiFiSocketBuffer.read(_sock, &b, sizeof(b));
+  _parsed--;
+
+  return b;
 }
 
 int WiFiUDP::read(unsigned char* buffer, size_t len)
 {
-  if (available())
+  if (_parsed < 1)
   {
-	  uint16_t size = len;
-	  if (!ServerDrv::getDataBuf(_sock, buffer, &size))
-		  return -1;
-	  return size;
-  }else{
-	  return -1;
+    return 0;
   }
+
+  int result = WiFiSocketBuffer.read(_sock, buffer, len);
+
+  if (result > 0)
+  {
+    _parsed -= result;
+  }
+
+  return result;
 }
 
 int WiFiUDP::peek()
 {
-  uint8_t b;
-  if (!available())
+  if (_parsed < 1)
+  {
     return -1;
+  }
 
-  ServerDrv::getData(_sock, &b, 1);
-  return b;
+  return WiFiSocketBuffer.peek(_sock);
 }
 
 void WiFiUDP::flush()

src/WiFiUdp.h

@@ -29,6 +29,7 @@ class WiFiUDP : public UDP {
 private:
   uint8_t _sock;  // socket ID for Wiz5100
   uint16_t _port; // local port to listen on
+  int _parsed;
 
 public:
   WiFiUDP();  // Constructor