Changeset 2415 for code/branches/presentation/src/orxonox/gamestates

Timestamp:

Dec 12, 2008, 10:10:31 AM (16 years ago)

Author:

scheusso

Message:

• adjusted some priorities of objects (movableentity, controllableentity, positionableentity, model)
• dedicated server mode doesn't consume 100%cpu load anymore now

Location:

code/branches/presentation/src/orxonox/gamestates

Files:

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

code/branches/presentation/src/orxonox/gamestates/GSDedicated.cc

@@ -35 +35 @@
 #include "network/Server.h"
 #include "objects/Tickable.h"
+#include "util/Sleep.h"
 
 namespace orxonox
@@ -41 +42 @@
         : GameState<GSRoot>("dedicated")
         , server_(0)
+        , timeSinceLastUpdate_(0)
     {
     }
@@ -72 +74 @@
     void GSDedicated::ticked(const Clock& time)
     {
-        GSLevel::ticked(time);
-        server_->tick(time.getDeltaTime());
-        this->tickChild(time);
+//         static float startTime = time.getSecondsPrecise();
+//         static int nrOfTicks = 0;
+        timeSinceLastUpdate_+=time.getDeltaTime();
+        if(timeSinceLastUpdate_>=NETWORK_PERIOD){
+//             ++nrOfTicks;
+//             COUT(0) << "estimated ticks/sec: " << nrOfTicks/(time.getSecondsPrecise()-startTime) << endl;
+            timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
+            GSLevel::ticked(time);
+            server_->tick(time.getDeltaTime());
+            this->tickChild(time);
+        }
+        else
+        {
+            usleep( (int)( (NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ) );
+//             COUT(0) << "sleeping for " << (int)( (NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ) << " usec" << endl;
+        }
     }
 }

code/branches/presentation/src/orxonox/gamestates/GSDedicated.h

@@ -49 +49 @@
 
         Server*      server_;
+        float        timeSinceLastUpdate_;
     };
 }