Changeset 5625 in orxonox.OLD

Timestamp:

Nov 17, 2005, 10:05:35 AM (18 years ago)

Author:

rennerc

Message:

network_socket: added new mutex

Location:

branches/network/src/lib/network

Files:

• network_socket.cc (modified) (8 diffs)
• network_socket.h (modified) (1 diff)

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

@@ -41 +41 @@
 
   mutex = SDL_CreateMutex();
+  socketmutex = SDL_CreateMutex();
   terminateThread = false;
 
@@ -62 +63 @@
 NetworkSocket::~ NetworkSocket( )
 {
-  SDL_DestroyMutex(mutex);
-
   /* Quit SDL_net */
   // NOTE: what if other instances of NetworkSocket running?
   SDLNet_Quit();
   PRINTF(5)("SDL_net shutdown\n");
+
+  SDL_DestroyMutex(mutex);
+  SDL_DestroyMutex(socketmutex);
 }
 
@@ -135 +137 @@
   terminateThread = true;
   /* Close the connection */
+
+  SDL_mutexP(socketmutex);
   SDLNet_TCP_Close(tcpSocket);
   tcpSocket = NULL;
+  SDL_mutexV(socketmutex);
 
 }
@@ -151 +156 @@
 int NetworkSocket::writeBytes(byte * data, int length)
 {
+  SDL_mutexP(socketmutex);
+
   if (!tcpSocket || data==NULL)
     return 0;
 
   int res = SDLNet_TCP_Send(tcpSocket, data, length);
+
+  SDL_mutexV(socketmutex);
 
   if (res<length)
@@ -175 +184 @@
 int NetworkSocket::readBytes(byte * data, int length)
 {
-  if (!tcpSocket || data==NULL)
+  if (data==NULL)
     return 0;
 
@@ -212 +221 @@
   tempsocket = SDLNet_TCP_Accept(self->tcpSocket);
 
+  SDL_mutexP(self->socketmutex);
   SDLNet_TCP_Close(self->tcpSocket);
   self->tcpSocket = NULL;
@@ -218 +228 @@
   {
     PRINTF(1)("SDLNet_TCP_Accept: %s\n", SDLNet_GetError());
+    SDL_mutexV(self->socketmutex);
     return -1;
   }
 
   self->tcpSocket = tempsocket;
+
+  SDL_mutexV(self->socketmutex);
 
   return thread_read(data);
@@ -249 +262 @@
     {
       PRINTF(1)("SDLNet_TCP_Recv: %s\n", SDLNet_GetError());
+
+      SDL_mutexP(self->socketmutex);
+
       SDLNet_TCP_Close(self->tcpSocket);
       self->tcpSocket = NULL;
+
+      SDL_mutexV(self->socketmutex);
       SDL_mutexV(self->mutex);
       return -1;

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

@@ -39 +39 @@
 
   SDL_mutex * mutex;
+  SDL_mutex * socketmutex;
   bool terminateThread;