Changeset 6139 in orxonox.OLD for trunk/src/lib/network/network_socket.cc

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/lib/network/network_socket.cc (modified) (18 diffs)

trunk/src/lib/network/network_socket.cc

@@ -28 +28 @@
 #include "debug.h"
 
-
 /**
  * Default constructor
@@ -52 +51 @@
   this->tcpSocket = sock;
 
-  SDL_CreateThread(thread_read, (void*)this);
-  SDL_CreateThread(thread_write, (void*)this);
+  readThread = SDL_CreateThread(thread_read, (void*)this);
+  writeThread = SDL_CreateThread(thread_write, (void*)this);
 }
 
@@ -65 +64 @@
   outgoingBufferLength = 0;
 
+  readThread = NULL;
+  writeThread = NULL;
+
+
+  thread_write_running = false;
+  thread_read_running = false;
+
   incomingBufferMutex = SDL_CreateMutex();
   outgoingBufferMutex = SDL_CreateMutex();
+
+
   socketMutex = SDL_CreateMutex();
   terminateThread = false;
@@ -89 +97 @@
  * Default destructor
  */
-NetworkSocket::~ NetworkSocket( )
-{
+NetworkSocket::~NetworkSocket( )
+{
+  this->terminateThread = true;
   /* Quit SDL_net */
   // NOTE: what if other instances of NetworkSocket running?
@@ -99 +108 @@
   SDL_DestroyMutex(outgoingBufferMutex);
   SDL_DestroyMutex(socketMutex);
+  SDL_DestroyMutex(threadTerminationMutex);
 }
 
@@ -122 +132 @@
   }
 
-  SDL_CreateThread(thread_read, (void*)this);
-  SDL_CreateThread(thread_write, (void*)this);
+  readThread = SDL_CreateThread(thread_read, (void*)this);
+  writeThread = SDL_CreateThread(thread_write, (void*)this);
 }
 
@@ -152 +162 @@
 int NetworkSocket::writeBytes(byte * data, int length)
 {
-  PRINTF(0)("NetworkSocket::writeBytes()\n");
+  PRINTF(5)("NetworkSocket::writeBytes()\n");
 #ifdef _USE_OUTGOING_BUFFER
 
@@ -200 +210 @@
 int NetworkSocket::readBytes(byte * data, int length)
 {
-  PRINTF(0)("NetworkSocket::readBytes()\n");
+  PRINTF(5)("NetworkSocket::readBytes()\n");
   if (data==NULL)
     return 0;
@@ -256 +266 @@
   NetworkSocket * self = (NetworkSocket*)data;
 
+  self->thread_read_running = true;
+
   while (!self->terminateThread)
   {
@@ -263 +275 @@
 
     //if buffer is full
-    if (nbytestoread<=0)
+    if (nbytestoread<=0 || !self->tcpSocket)
     {
       SDL_Delay(_MSECONDS_SLEEP_FULL_BUFFER);
@@ -275 +287 @@
     if (nbytesread<=0)
     {
-      printf("SDLNet_TCP_Recv: %s\n", SDLNet_GetError());
+      if (nbytesread<0)
+        printf("SDLNet_TCP_Recv: %s\n", SDLNet_GetError());
 
       SDL_mutexP(self->socketMutex);
@@ -284 +297 @@
       SDL_mutexV(self->socketMutex);
       SDL_mutexV(self->incomingBufferMutex);
-      return -1;
+      continue;
     }
 
@@ -295 +308 @@
   }
 
+  SDL_mutexP(self->threadTerminationMutex);
+  self->thread_read_running = false;
+
+  if ( !self->thread_write_running )
+  {
+    //delete self;
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+  else
+  {
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+
+
+  PRINTF(0)("QUIT READ THREAD\n");
   return 0;
 }
@@ -305 +333 @@
   NetworkSocket * self = (NetworkSocket*)data;
 
+  self->thread_write_running = true;
+
   while (!self->terminateThread)
   {
@@ -314 +344 @@
 
     //if buffer is full
-    if (nbytestowrite<=0)
+    if (nbytestowrite<=0 || !self->tcpSocket)
     {
       SDL_Delay(_MSECONDS_SLEEP_EMPTY_BUFFER);
@@ -342 +372 @@
 
       SDL_mutexV(self->socketMutex);
-      return -1;
+      continue;
     }
 
   }
 
-  printf("QUIT WRITE THREAD\n");
+  SDL_mutexP(self->threadTerminationMutex);
+  self->thread_write_running = false;
+
+  if ( !self->thread_read_running )
+  {
+    //delete self;
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+  else
+  {
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+
+
+  PRINTF(0)("QUIT WRITE THREAD\n");
   return 0;
 }
@@ -353 +397 @@
 bool NetworkSocket::writePacket( byte * data, int length )
 {
-  PRINTF(0)("NetworkSocket::writePacket()\n");
+  PRINTF(5)("NetworkSocket::writePacket()\n");
   if (length>255)
   {
@@ -368 +412 @@
 int NetworkSocket::readPacket( byte * data, int maxLength )
 {
-  PRINTF(0)("NetworkSocket::readPacket()\n");
+  PRINTF(5)("NetworkSocket::readPacket()\n");
   if (incomingBufferLength<1)
   {