Changeset 6026 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

network_socket: should compile now

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) (6 diffs)

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;

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

@@ -40 +40 @@
   server.listen(9999);
 
-  NetworkSocket client1(ip);
+  NetworkSocket* client1 = new NetworkSocket(ip);
 
   NetworkSocket* server1 = server.getNewSocket();
 
-  NetworkSocket client2(ip);
+  NetworkSocket* client2 = new NetworkSocket(ip);
 
   NetworkSocket* server2 = server.getNewSocket();
@@ -51 +51 @@
 
   printf("read from client1 before sending data\n");
-  printf("result: %d bytes\n", client1.readPacket((byte*)buf, 1024));
+  printf("result: %d bytes\n", client1->readPacket((byte*)buf, 1024));
 
   printf("read from client2 before sending data\n");
-  printf("result: %d bytes\n", client2.readPacket((byte*)buf, 1024));
+  printf("result: %d bytes\n", client2->readPacket((byte*)buf, 1024));
 
   int n;
@@ -61 +61 @@
   char * str3 = "client2 to server";
   char * str4 = "server2 to client";
-  n = client1.writePacket((byte*)str1, strlen(str1)+1);
+  n = client1->writePacket((byte*)str1, strlen(str1)+1);
   printf("%d bytes send from client1\n", n);
   n = server1->writePacket((byte*)str2, strlen(str2)+1);
   printf("%d bytes send from server1\n", n);
-  n = client2.writePacket((byte*)str3, strlen(str3)+1);
+  n = client2->writePacket((byte*)str3, strlen(str3)+1);
   printf("%d bytes send from client2\n", n);
   n = server2->writePacket((byte*)str4, strlen(str4)+1);
@@ -88 +88 @@
 
   printf("read from client1\n");
-  n = client1.readPacket((byte*)buf, 1024);
+  n = client1->readPacket((byte*)buf, 1024);
   printf("read %d bytes\n", n);
   if (n<0)
@@ -96 +96 @@
 
   printf("read from client2\n");
-  n = client2.readPacket((byte*)buf, 1024);
+  n = client2->readPacket((byte*)buf, 1024);
   printf("read %d bytes\n", n);
   if (n<0)
@@ -106 +106 @@
 
   printf("try to send more than 255 bytes\n");
-  printf("result: %d\n", client1.writePacket((byte*)buf, 1000));
+  printf("result: %d\n", client1->writePacket((byte*)buf, 1000));
 
   server1->writePacket((byte*)str1, strlen(str1)+1);
   SDL_Delay(500);
   printf("try to read with a too small buffer\n");
-  printf("result: %d\n", client1.readPacket((byte*)buf, strlen(str1)));
+  printf("result: %d\n", client1->readPacket((byte*)buf, strlen(str1)));
 
   return 0;