Changeset 2382

Timestamp:

Dec 10, 2008, 3:36:36 PM (16 years ago)

Author:

scheusso

Message:

changes in trafficcontrol:

• configvalue for targetsize (size of each gamestate)

Location:

code/branches/presentation/src/network

Files:

• GamestateManager.cc (modified) (1 diff)
• GamestateManager.h (modified) (2 diffs)
• TrafficControl.cc (modified) (5 diffs)
• TrafficControl.h (modified) (3 diffs)
• packet/Gamestate.cc (modified) (2 diffs)
• packet/Gamestate.h (modified) (1 diff)

code/branches/presentation/src/network/GamestateManager.cc

@@ -56 +56 @@
   GamestateManager::GamestateManager() {
     id_=0;
+    trafficControl_ = new TrafficControl();
   }
 
   GamestateManager::~GamestateManager() {
+    delete trafficControl_;
   }
 

code/branches/presentation/src/network/GamestateManager.h

@@ -43 +43 @@
 #include "NetworkPrereqs.h"
 #include "GamestateHandler.h"
+#include "TrafficControl.h"
 #include <map>
 
@@ -89 +90 @@
     std::map<unsigned int, packet::Gamestate*> gamestateQueue;
     packet::Gamestate *reference;
+    TrafficControl *trafficControl_;
     unsigned int id_;
   };

code/branches/presentation/src/network/TrafficControl.cc

@@ -30 +30 @@
 
 #include "synchronisable/Synchronisable.h"
+#include "core/ConfigValueIncludes.h"
 
 #include <cassert>
@@ -67 +68 @@
         TrafficControl::TrafficControl()
         {
+    RegisterRootObject(TrafficControl);
           assert(instance_==0);
           instance_=this;
-    targetSize = 1000;//5000bytes
+//     targetSize = 2500;//5000bytes
+    SetConfigValue ( targetSize, 28000./25. );
         }
         
@@ -127 +130 @@
           return;
         }
+  
+  TrafficControl *TrafficControl::getInstance()
+  {
+    assert(instance_);
+    return instance_;
+  }
         
         void TrafficControl::ack(unsigned int clientID, unsigned int gamestateID)
@@ -347 +356 @@
     
     //now we check, that the creator of an object always exists on a client
-    printList(list, clientID);
+//     printList(list, clientID);
     std::list<obj>::iterator itcreator;
     for(itvec = list->begin(); itvec != list->end(); itvec++)
@@ -356 +365 @@
     //now the cutting, work the same obj out in processobjectlist and copiedlist, compression rate muss noch festgelegt werden. 
     cut(list, targetSize);
-    printList(list, clientID);
+//     printList(list, clientID);
     //diese Funktion updateClientList muss noch gemacht werden
     updateClientListTemp(list);

code/branches/presentation/src/network/TrafficControl.h

@@ -37 +37 @@
 #include <algorithm>
 #include "util/Integers.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox {
@@ -78 +79 @@
 *
 */
-class TrafficControl{
+class TrafficControl : public OrxonoxClass{
   private:
 
@@ -153 +154 @@
     *Elements of struct i are therefore: *list[i].objID
     */
+    static TrafficControl *getInstance();
     void processObjectList(unsigned int clientID, unsigned int gamestateID, std::list<obj>* list); //gets a pointer to the list (containing objectIDs) and sorts it
     //done

code/branches/presentation/src/network/packet/Gamestate.cc

@@ -49 +49 @@
 
 #define PACKET_FLAG_GAMESTATE  ENET_PACKET_FLAG_RELIABLE
-  
-TrafficControl Gamestate::trafficControl_;
 
 Gamestate::Gamestate()
@@ -362 +360 @@
 
   //call TrafficControl
-  trafficControl_.processObjectList( clientID, HEADER->id, &dataMap_ );
+  TrafficControl::getInstance()->processObjectList( clientID, HEADER->id, &dataMap_ );
   
   //copy in the zeros

code/branches/presentation/src/network/packet/Gamestate.h

@@ -95 +95 @@
     void removeObject(ObjectListIterator<Synchronisable> &it);
     std::list<obj> dataMap_;
-    static TrafficControl trafficControl_;
+//     static TrafficControl *trafficControl_;
 };