Changeset 2415 for code/branches/presentation/src/network

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/network

Files:

• NetworkPrereqs.h (modified) (1 diff)
• Server.cc (modified) (1 diff)
• Server.h (modified) (1 diff)
• TrafficControl.cc (modified) (3 diffs)
• synchronisable/Synchronisable.cc (modified) (2 diffs)
• synchronisable/Synchronisable.h (modified) (2 diffs)

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

@@ -73 +73 @@
   static const unsigned int CLIENTID_UNKNOWN = (unsigned int)-2;
   static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
-  static const unsigned int SCHED_PRIORITY_OFFSET = -5;
 
   

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

@@ -63 +63 @@
 {
   const unsigned int MAX_FAILURES = 20;
-  const unsigned int NETWORK_FREQUENCY = 25;
-  const float NETWORK_PERIOD = (float)1/NETWORK_FREQUENCY;
 
   /**

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

@@ -52 +52 @@
 {
   const int CLIENTID_SERVER = 0;
+  const unsigned int NETWORK_FREQUENCY = 25;
+  const float NETWORK_PERIOD = 1./NETWORK_FREQUENCY;
 
   /**

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

@@ -36 +36 @@
 
 namespace orxonox {
+  
+  static const unsigned int SCHED_PRIORITY_OFFSET = -1;
 
   objInfo::objInfo(uint32_t ID, uint32_t creatorID, int32_t curGsID, int32_t diffGsID, uint32_t size, unsigned int prioperm, unsigned int priosched)
@@ -256 +258 @@
     {
       assert( (*itvec).objSize < 1000);
-//       COUT(0) << "==targetsize==  " << targetsize << endl;
       if ( ( size + (*itvec).objSize ) < targetsize )
       {
-//         COUT(0) << "no cut" << endl;
         size += (*itvec).objSize;//objSize is given in bytes
         ++itvec;
@@ -265 +265 @@
       else
       {
-        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);

code/branches/presentation/src/network/synchronisable/Synchronisable.cc

@@ -66 +66 @@
     RegisterRootObject(Synchronisable);
     static uint32_t idCounter=0;
-    objectFrequency_=1;
     objectMode_=0x1; // by default do not send data to server
     if ( !Host::running() || ( Host::running() && Host::isServer() ) )
@@ -78 +77 @@
     classID = static_cast<uint32_t>(-1);
 
-
+    // set standard priority
+    this->setPriority( priority::normal );
+
+    
+    // get creator id
 #ifndef NDEBUG
     ObjectList<Synchronisable>::iterator it;

code/branches/presentation/src/network/synchronisable/Synchronisable.h

@@ -61 +61 @@
     };
   }
+  
+  namespace priority{
+    enum prio{
+      very_high   = -30,
+      high        = -15,
+      normal      = 0,
+      low         = 15,
+      very_low    = 30
+    };
+  }
 
   struct _NetworkExport synchronisableHeader{
@@ -101 +111 @@
     template <class T> void unregisterVariable(T& var);
     void setObjectMode(uint8_t mode);
-    void setObjectPriority(unsigned int freq){ objectFrequency_ = freq; }
+    void setPriority(unsigned int freq){ objectFrequency_ = freq; }