Changeset 1150

Timestamp:

Apr 23, 2008, 11:40:40 PM (16 years ago)

Author:

dumenim

Message:

either i'm wrong or the hud is. it seems to create a segfault in startRenderLoop, don't know if only in network branch. there are some std::couts commented with 3 / (blue and the hud calls are commented out too. now it goes a bit further untill the next segfault.

Location:

code/branches/network2/src

Files:

• network/ClientConnection.cc (modified) (1 diff)
• network/diffTest.cc (modified) (4 diffs)
• orxonox/Orxonox.cc (modified) (8 diffs)

code/branches/network2/src/network/ClientConnection.cc

@@ -164 +164 @@
         COUT(5) << "Cl.Con: receiver-Thread while loop: got new packet" << std::endl;
         if ( !processData(&event) ) COUT(2) << "Current packet was not pushed to packetBuffer -> ev ongoing SegFault" << std::endl;
+        COUT(5) << "Cl.Con: processed Data in receiver-thread while loop" << std::endl;
         break;
       case ENET_EVENT_TYPE_DISCONNECT:

code/branches/network2/src/network/diffTest.cc

@@ -11 +11 @@
 #include "ConnectionManager.h"
 #include "ClientInformation.h"
+#include "Synchronisable.h"
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
@@ -614 +615 @@
 //### end packetbuffer test stuff ###
 
+void testSynchronisable() {
+  Synchronisable* synchtest;
+  unsigned char* data = new unsigned char[100];
+  for( int i=0; i<100; i++ ) {
+    data[i] = i%10;
+  }
+  //synchtest->registerVar( (const void*)data, 100, network::DATA );
+}
+
+//#########################################################################
+//### this stuff is only a loop to chose one of the prev test functions ###
+//#########################################################################
 void displayModes() {
   std::cout << "mode datalength: length of data array to create" << std::endl;
@@ -629 +642 @@
   std::cout << "\t-5 -> only half as long and ever %10 == 0 index is different" << std::endl;
 }
-
+/**
 int main( int argc, char* argv[] ) {
   int a,b,c,n;
@@ -699 +712 @@
   }
   return 0;
-}
-/**
+}*/
+
 int main() {
   std::cout << "############### START TEST (quit q) ###############" << std::endl;
-  testClientInformation( 10 );
-}*/
+  testSynchronisable();
+}
+
+//#########################################################################
+//### the prev loop is only to chose one prev prev test functions       ###
+//#########################################################################

code/branches/network2/src/orxonox/Orxonox.cc

@@ -333 +333 @@
 
     //setupInputSystem();
-
+    std::cout << "STARTING RENDERLOOP" << std::endl;
     startRenderLoop();
   }
@@ -416 +416 @@
   void Orxonox::startRenderLoop()
   {
+    ///std::cout << "ON LINE 418 IN Orxonox.cc on frame " << std::endl;
     InputBuffer* ib = new InputBuffer();
     InputManager::getSingleton().feedInputBuffer(ib);
@@ -423 +424 @@
     ib->registerListener(console, &Testconsole::execute, '\n', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
+    ib->registerListener(console, &Testconsole::clear, '�', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
@@ -435 +436 @@
     Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
 
-
+    ///std::cout << "ON LINE 437 IN Orxonox.cc" << std::endl;
     // Contains the times of recently fired events
     // eventTimes[4] is the list for the times required for the fps counter
@@ -450 +451 @@
       timer_ = new Ogre::Timer();
     timer_->reset();
-
+    ///std::cout << "ON LINE 452 IN Orxonox.cc" << std::endl;
+    int counter = 0;
           while (!bAbort_)
           {
@@ -456 +458 @@
       // This calls the WindowEventListener objects.
       Ogre::WindowEventUtilities::messagePump();
-
+      ///std::cout << "ON LINE 459 IN Orxonox.cc on frame " << counter << std::endl;
       // get current time
       unsigned long now = timer_->getMilliseconds();
@@ -466 +468 @@
       evt.timeSinceLastEvent = calculateEventTime(now, eventTimes[0]);
       evt.timeSinceLastFrame = calculateEventTime(now, eventTimes[1]);
+      ///std::cout << "ON LINE 468 IN Orxonox.cc on frame " << counter << std::endl;
 
       // show the current time in the HUD
-      orxonoxHUD_->setTime((int)now, 0);
-      if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        orxonoxHUD_->setRocket1((int)(20000.0f/(eventTimes[3].back() - eventTimes[3].front())));
-
+      ///### THE FOLLOWING HUD STUFF SEEMS TO CREATE SEGFAULT IN NETWORK
+      ///orxonoxHUD_->setTime((int)now, 0);
+      ///std::cout << "ON LINE 473 IN Orxonox.cc on frame " << counter << std::endl;
+      ///if (eventTimes[3].back() - eventTimes[3].front() != 0)
+        ///orxonoxHUD_->setRocket1((int)(20000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+      ///std::cout << "ON LINE 476 IN Orxonox.cc on frame " << counter << std::endl;
       // Iterate through all Tickables and call their tick(dt) function
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      ///std::cout << "ON LINE 476 IN Orxonox.cc on frame " << counter << std::endl;
 
       // don't forget to call _fireFrameStarted in ogre to make sure
@@ -493 +499 @@
       // again, just to be sure ogre works fine
       ogreRoot._fireFrameEnded(evt);
+      counter++;
           }
   }