Changeset 5798 in orxonox.OLD

Timestamp:

Nov 27, 2005, 5:52:32 PM (19 years ago)

Author:

patrick

Message:

network: testing env. got segfault in the code

Location:

branches/network/src

Files:

• lib/network/connection_monitor.cc (modified) (1 diff)
• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_socket.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/network_stream.h (modified) (2 diffs)
• subprojects/network/network_unit_test.cc (modified) (1 diff)
• subprojects/network/simple_sync.cc (modified) (5 diffs)

branches/network/src/lib/network/connection_monitor.cc

@@ -128 +128 @@
 void ConnectionMonitor::displayStatistic()
 {
-  PRINT(0)("============================================\n");
-  PRINT(0)("Connection Monitor Network Statistics:\n");
-  PRINT(0)("Total received packets:",totalReceivedPackets);
-  PRINT(0)("Average datarate :\n",averageDatarate);
-  PRINT(0)("Total lost packets:",totalLostPackets);
-  PRINT(0)("Packetloss [%] :\n",totalPacketloss);
-
-  PRINT(0)("Current datarate :\n",currentDatarate);
-  PRINT(0)("Delays of the last few packets :\n");
-  for(int i=1 ;i <= packetToAverage-1;i++)
-    PRINT(0)("%i ",lastFewDelays[i]);
-
-  PRINT(0)("============================================\n");
+//   PRINT(0)("============================================\n");
+//   PRINT(0)("Connection Monitor Network Statistics:\n");
+//   PRINT(0)("Total received packets:",totalReceivedPackets);
+//   PRINT(0)("Average datarate :\n",averageDatarate);
+//   PRINT(0)("Total lost packets:",totalLostPackets);
+//   PRINT(0)("Packetloss [%] :\n",totalPacketloss);
+// 
+//   PRINT(0)("Current datarate :\n",currentDatarate);
+//   PRINT(0)("Delays of the last few packets :\n");
+//   for(int i=1 ;i <= packetToAverage-1;i++)
+//     PRINT(0)("%i ",lastFewDelays[i]);
+// 
+//   PRINT(0)("============================================\n");
 
 }

branches/network/src/lib/network/network_manager.cc

@@ -167 +167 @@
     while( stream)
     {
+      printf("NetworkManager::synchronize ");
+      if(stream->isServer()) printf("Server\n"); else printf("Client\n");
       stream->processData();
       stream = (NetworkStream*)(iterator->nextElement());

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

@@ -218 +218 @@
   memcpy(outgoingBuffer + outgoingBufferLength, data, nbytes);
   outgoingBufferLength += nbytes;
-
+  
   SDL_mutexV(outgoingBufferMutex);
 

branches/network/src/lib/network/network_stream.cc

@@ -121 +121 @@
 
   /* first of all read  data from networkSocket*/
-  while(ret == 0)
   ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
   /* error checking: data read? */

branches/network/src/lib/network/network_stream.h

@@ -26 +26 @@
   void init();
   
+  inline bool isServer() { return (this->type == NET_SERVER)? true:false; }
   virtual void processData();
 
@@ -35 +36 @@
    Synchronizeable*         synchronizeables;
    NetworkSocket* networkSocket;
+   int                    type;
 };
 #endif /* _NETWORK_STREAM */

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

@@ -144 +144 @@
 
   /* synchronize the data 1 time (increment for longer tests) */
-  for( int i = 0; i < 1; i++) {
+  for( int i = 0; i < 3; i++) {
     nm->synchronize();
   }
 
+  printf("Test finished\n");
+  
+  
   /* delete the network manager again */
   delete nm;

branches/network/src/subprojects/network/simple_sync.cc

@@ -31 +31 @@
 {
   this->outLength = 10;
-  this->inLength = 0;
+  this->inLength = 40;
   this->outData = new byte[this->outLength];
+  this->inData = new byte[this->inLength];
   
   for( int i = 0; i < this->outLength; i++)
@@ -48 +49 @@
 
 /**
- *  write data to NetworkStream
+ *  write data to Synchronizeable
  */
 void SimpleSync::writeBytes(byte* data, int length)
 {
+  if(this->inLength < length)
+    PRINTF(0)("ERROR: local buffer is smaller than the data to receive.\n");
   /* copy the data localy */
-  this->inLength = length;
-  for(int i = 0; i < length; i++)
+  for( int i = 0; i < this->inLength; i++)
   {
     this->inData[i] = data[i];
@@ -64 +66 @@
 
 /**
- *  read data from NetworkStream
+ *  read data from Synchronizeable
  */
 int SimpleSync::readBytes(byte* data)
@@ -79 +81 @@
 {
   PRINTF(0)("Write in: |");
-  for(int i = 0; i < inLength; i++)
+  for(int i = 0; i < this->inLength; i++)
   {
     PRINT(0)(" %i ",this->inData[i]);
@@ -89 +91 @@
 {
   PRINTF(0)("Read out: |");
-  for(int i = 0; i < outLength; i++)
+  for(int i = 0; i < this->outLength; i++)
   {
     PRINT(0)(" %i ",this->outData[i]);