Changeset 2532

Timestamp:

Dec 23, 2008, 11:15:09 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 2377-2382 to bugger from presentation.

Location:

code/branches/bugger/src/network

Files:

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

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

@@ -57 +57 @@
   GamestateManager::GamestateManager() {
     id_=0;
+    trafficControl_ = new TrafficControl();
   }
 
   GamestateManager::~GamestateManager() {
+    delete trafficControl_;
   }
 
@@ -185 +187 @@
     }
     temp->setGamestateID(gamestateID);
+    TrafficControl::processAck(clientID, gamestateID);
     return true;
   }

code/branches/bugger/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/bugger/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;
         }
-        
-        void TrafficControl::processAck(unsigned int clientID, unsigned int gamestateID)
+  
+  TrafficControl *TrafficControl::getInstance()
+  {
+    assert(instance_);
+    return instance_;
+  }
+        
+        void TrafficControl::ack(unsigned int clientID, unsigned int gamestateID)
         {
           std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
@@ -141 +150 @@
       if(clientListPerm_[clientID].find((*itvec).objID) != clientListPerm_[clientID].end()) // check whether the obj already exists in our lists
       {
-        clientListPerm_[clientID][(*itvec).objID].objID = gamestateID;
+        clientListPerm_[clientID][(*itvec).objID].objCurGS = gamestateID;
+        clientListPerm_[clientID][(*itvec).objID].objValueSched = 0; //set scheduling value back
       }
       else
       {
+        assert(0);
         clientListPerm_[clientID][(*itvec).objID].objCurGS = gamestateID;
         clientListPerm_[clientID][(*itvec).objID].objID = (*itvec).objID;
@@ -225 +236 @@
 //     for(itvec = list.begin(); itvec!=list.end(), itvec++)
 //     {
-//       ittempgs.insert(itvec);
+//       ittempgs.insert(itvec);static
 //     }
   }
@@ -236 +247 @@
   {
     unsigned int size=0;
-    std::list<obj>::iterator itvec;
+    std::list<obj>::iterator itvec, ittemp;
     assert(!list->empty());
-    itvec = list->begin();
-    for(itvec = list->begin(); itvec != list->end() && size<targetsize; itvec++)
+    for(itvec = list->begin(); itvec != list->end();)
     {
       assert( (*itvec).objSize < 1000);
-      if ( size + (*itvec).objSize < targetsize )
-      {
+//       COUT(0) << "==targetsize==  " << targetsize << endl;
+      if ( ( size + (*itvec).objSize ) < targetsize )
+      {
+//         COUT(0) << "no cut" << endl;
         size += (*itvec).objSize;//objSize is given in bytes
+        ++itvec;
       }
       else
       {
-        clientListPerm_[currentClientID][(*itvec).objID].objValueSched -= SCHED_PRIORITY_OFFSET;
+//         COUT(0) << "cut" << endl;
+        clientListPerm_[currentClientID][(*itvec).objID].objValueSched += SCHED_PRIORITY_OFFSET; // NOTE: SCHED_PRIORITY_OFFSET is negative
+//         ittemp = itvec;
         list->erase(itvec++);
-      }
+//         itvec = ittemp;
+      }
+//       printList(list, currentClientID);
     }
     assert(!list->empty());
@@ -339 +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++)
@@ -348 +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);
@@ -359 +376 @@
     COUT(0) << "=========== Objectlist ===========" << endl;
     for( it=list->begin(); it!=list->end(); it++)
-      COUT(0) << "ObjectID: " << (*it).objID << " creatorID: " << (*it).objCreatorID << " Priority: " << clientListPerm_[clientID][(*it).objID].objValuePerm + clientListPerm_[clientID][(*it).objID].objValueSched << endl;
+      COUT(0) << "ObjectID: " << (*it).objID << " creatorID: " << (*it).objCreatorID << " Priority: " << clientListPerm_[clientID][(*it).objID].objValuePerm + clientListPerm_[clientID][(*it).objID].objValueSched << " size: " << (*it).objSize << endl;
   }
   

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

@@ -37 +37 @@
 #include <algorithm>
 #include "util/Integers.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox {
@@ -52 +53 @@
       uint32_t objDiffGS;//difference between current and latest GameState
       uint32_t objSize;
-      unsigned int objValuePerm;
-      unsigned int objValueSched;
+      int objValuePerm;
+      int objValueSched;
       objInfo(uint32_t ID, uint32_t creatorID, int32_t curGsID, int32_t diffGsID, uint32_t size, unsigned int prioperm, unsigned int priosched);
       objInfo();
@@ -78 +79 @@
 *
 */
-class TrafficControl{
+class TrafficControl : public OrxonoxClass{
   private:
 
@@ -139 +140 @@
     */
     void evaluateList(unsigned int clientID, std::list<obj> *list);//done    
+    void ack(unsigned int clientID, unsigned int gamestateID);  // this function gets called when the server receives an ack from the client
 
   protected:
@@ -152 +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
-    void processAck(unsigned int clientID, unsigned int gamestateID);   // this function gets called when the server receives an ack from the client
+    static void processAck(unsigned int clientID, unsigned int gamestateID)
+    { return instance_->ack(clientID, gamestateID); }
     //done
     void deleteObject(unsigned int objectID);                           // this function gets called when an object has been deleted (in order to clean up lists and maps)

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

@@ -50 +50 @@
 
 #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/bugger/src/network/packet/Gamestate.h

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