Changeset 5628 in orxonox.OLD for branches/network

Timestamp:

Nov 18, 2005, 10:55:08 AM (19 years ago)

Author:

rennerc

Message:

network_unit_test.cc: added test for much data
network_socket: added delay if input buffer is full

Location:

branches/network/src

Files:

• lib/network/network_socket.cc (modified) (3 diffs)
• lib/network/network_socket.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (1 diff)

branches/network/src/lib/network/network_socket.cc

@@ -167 +167 @@
   if (res<length)
     PRINTF(1)("SDLNet_TCP_Send: %s\n", SDLNet_GetError());
-        
-        return res;
+
+  return res;
 }
 
@@ -254 +254 @@
     nbytestoread = min(_INCOMING_BUFFER_SIZE - self->bufferlength, _LOCAL_BUFFER_SIZE);
 
+    //if buffer is full
+    if (nbytestoread<=0)
+    {
+      SDL_Delay(_MSECONDS_SLEEP_FULL_BUFFER);
+      continue;
+    }
+
     nbytesread = SDLNet_TCP_Recv(self->tcpSocket, buffer, nbytestoread);
 
@@ -282 +289 @@
 
 
+

branches/network/src/lib/network/network_socket.h

@@ -10 +10 @@
 #define _INCOMING_BUFFER_SIZE 10240
 #define _LOCAL_BUFFER_SIZE 1024
+#define _MSECONDS_SLEEP_FULL_BUFFER 10
 
 /* contains memmove and memcpy */

branches/network/src/subprojects/network/network_unit_test.cc

@@ -61 +61 @@
   printf("data: %s\n", buf);
 
+  printf("testing a bigger amount of data\n");
+
+#define _N_ELEMENTS 212992
+  char sendbuf[_N_ELEMENTS];
+  char recvbuf[_N_ELEMENTS];
+
+  for (int i = 0; i<_N_ELEMENTS; i++)
+    sendbuf[i] = i%30 + 30;
+
+  printf("write\n");
+  client.writeBytes((byte*)sendbuf, _N_ELEMENTS);
+
+  SDL_Delay(500);
+
+  printf("read\n");
+  int nbytes = server.readBytes((byte*)recvbuf, _N_ELEMENTS);
+  int offset = nbytes;
+
+  while (nbytes>0)
+  {
+    SDL_Delay(10);
+    printf("read\n");
+    nbytes = server.readBytes((byte*)recvbuf+offset, _N_ELEMENTS-offset);
+    offset += nbytes;
+    printf("nbytes=%d, offset=%d\n", nbytes, offset);
+  }
+
+  printf("strcmp = %d (0 is good :D not 0 is evil)\noffset = %d\n", strncmp(sendbuf, recvbuf, _N_ELEMENTS), offset);
+
   return 0;
 }