Changeset 13844 for trunk/FACT++/src/ratecontrol.cc

Timestamp:

05/23/12 19:32:56 (12 years ago)

Author:

tbretz

Message:

Removed the DimServiceInfoList; unified the Printing of states.

File:

• trunk/FACT++/src/ratecontrol.cc (modified) (2 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -51 +51 @@
     vector<bool> fBlock;
 
-    DimServiceInfoListImp fNetwork;
-
     DimVersion fDim;
-    DimState   fDimFTM;
-    DimState   fDimRS;
+    DimDescribedState fDimFTM;
+    DimDescribedState fDimRS;
 
     float  fTargetRate;
@@ -431 +429 @@
         return GetCurrentState();
     }
-/*
-    void PrintState(const pair<Time,int> &state, const char *server)
-    {
-        const State rc = fNetwork.GetState(server, state.second);
-
-        Out() << state.first.GetAsStr("%H:%M:%S.%f").substr(0, 12) << " - ";
-        Out() << kBold << server << ": ";
-        Out() << rc.name << "[" << rc.index << "]";
-        Out() << kReset << " - " << kBlue << rc.comment << endl;
-    }
-
-    int Print()
-    {
-        Out() << fStatusDim.first.GetAsStr("%H:%M:%S.%f").substr(0, 12) << " - ";
-        Out() << kBold << "DIM_DNS: ";
-        if (fStatusDim.second==0)
-            Out() << "Offline" << endl;
-        else
-            Out() << "V" << fStatusDim.second/100 << 'r' << fStatusDim.second%100 << endl;
-
-        PrintState(fStatusRS,  "RATE_SCAN");
-        PrintState(fStatusFTM, "FTM_CONTROL");
-
-        return GetCurrentState();
-    }
-    */
-
-    const State GetState(const DimState &s) const
-    {
-        return fNetwork.GetState(s.name(), s.state());
-    }
-
-    void PrintState(const DimState &state) const
-    {
-        const State rc = GetState(state);
-
-        Out() << state.time().GetAsStr("%H:%M:%S.%f").substr(0, 12) << " - ";
-        Out() << kBold << state.name() << ": ";
-        if (rc.index==-3)
-        {
-            Out() << kReset << "Offline" << endl;
-            return;
-        }
-        if (rc.index==-2)
-            Out() << state.state();
-        else
-            Out() << rc.name << "[" << rc.index << "]";
-        Out() << kReset << " - " << kBlue << rc.comment << endl;
-    }
 
     int Print() const
     {
-        Out() << fDim.time().GetAsStr("%H:%M:%S.%f").substr(0, 12) << " - ";
-        Out() << kBold << "DIM_DNS: " << fDim.version() << endl;
-
-        PrintState(fDimFTM);
-        PrintState(fDimRS);
+        Out() << fDim << endl;
+        Out() << fDimFTM << endl;
+        Out() << fDimRS << endl;
 
         return GetCurrentState();