Changeset 6026 in orxonox.OLD for branches/network/src/lib

Timestamp:

Dec 10, 2005, 9:57:51 PM (19 years ago)

Author:

rennerc

Message:

network_socket: should compile now

Location:

branches/network/src/lib/network

Files:

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

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

@@ -27 +27 @@
 /* header for debug output */
 #include "debug.h"
-
-static SDL_mutex* threadTerminationMutex = SDL_CreateMutex();
 
 /**
@@ -305 +303 @@
   }
 
-  SDL_mutexP(threadTerminationMutex);
+  SDL_mutexP(self->threadTerminationMutex);
   self->thread_read_running = false;
 
   if ( !self->thread_write_running )
+  {
+    SDL_mutexV(self->threadTerminationMutex);
     delete self;
-  SDL_mutexV(threadTerminationMutex);
+  }
+
 
   printf("QUIT READ THREAD\n");
@@ -365 +366 @@
   }
 
-  SDL_mutexP(threadTerminationMutex);
+  SDL_mutexP(self->threadTerminationMutex);
   self->thread_write_running = false;
 
   if ( !self->thread_read_running )
+  {
+    SDL_mutexV(self->threadTerminationMutex);
     delete self;
-  SDL_mutexV(threadTerminationMutex);
+  }
+
 
   printf("QUIT WRITE THREAD\n");

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

@@ -63 +63 @@
   bool terminateThread;
 
-  static SDL_mutex* threadTerminationMutex;
+  SDL_mutex* threadTerminationMutex;
   static int thread_read(void * data);
   bool thread_read_running;