Ticket 26. if (&set == this) checking removed in the operator().

[stg.git] / projects / stargazer / plugins / other / smux / sensors.h

diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h
index 16331b15fcaedfde179a230a515a7032039d1c1e..3787611f4263c3cbfe06fe10fac41f5e751b1e03 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -5,6 +5,10 @@
 
 #include "stg/users.h"
 #include "stg/tariffs.h"
+#include "stg/admins.h"
+#include "stg/services.h"
+#include "stg/corporations.h"
+#include "stg/traffcounter.h"
 #include "stg/user_property.h"
 
 #include "stg/ObjectSyntax.h"
@@ -14,6 +18,7 @@
 
 class Sensor {
     public:
+        virtual ~Sensor() {}
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
 #ifdef DEBUG
         virtual std::string ToString() const = 0;
@@ -29,13 +34,13 @@ class TotalUsersSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
-        ValueToOS(users.GetUserNum(), objectSyntax);
+        ValueToOS(users.Count(), objectSyntax);
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
-        { std::string res; x2str(users.GetUserNum(), res); return res; }
+        { std::string res; x2str(users.Count(), res); return res; }
 #endif
 
     private:
@@ -155,7 +160,16 @@ class TariffChangeUsersSensor : public UsersSensor {
 
     private:
         bool UserPredicate(USER_PTR userPtr) const
-        { return userPtr->GetProperty().nextTariff.ConstData().empty(); }
+        { return !userPtr->GetProperty().nextTariff.ConstData().empty(); }
+};
+
+class ActiveUsersSensor : public UsersSensor {
+    public:
+        ActiveUsersSensor(USERS & u) : UsersSensor(u) {}
+        virtual ~ActiveUsersSensor() {}
+
+    private:
+        bool UserPredicate(USER_PTR userPtr) const;
 };
 
 class TotalTariffsSensor : public Sensor {
@@ -165,13 +179,13 @@ class TotalTariffsSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
-        ValueToOS(tariffs.GetTariffsNum(), objectSyntax);
+        ValueToOS(tariffs.Count(), objectSyntax);
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
-        { std::string res; x2str(tariffs.GetTariffsNum(), res); return res; }
+        { std::string res; x2str(tariffs.Count(), res); return res; }
 #endif
 
     private:
@@ -185,13 +199,13 @@ class TotalAdminsSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
-        ValueToOS(admins.GetAdminsNum(), objectSyntax);
+        ValueToOS(admins.Count(), objectSyntax);
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
-        { std::string res; x2str(admins.GetAdminsNum(), res); return res; }
+        { std::string res; x2str(admins.Count(), res); return res; }
 #endif
 
     private:
@@ -205,13 +219,13 @@ class TotalServicesSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
-        ValueToOS(services.GetServicesNum(), objectSyntax);
+        ValueToOS(services.Count(), objectSyntax);
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
-        { std::string res; x2str(services.GetServicesNum(), res); return res; }
+        { std::string res; x2str(services.Count(), res); return res; }
 #endif
 
     private:
@@ -225,19 +239,39 @@ class TotalCorporationsSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
-        ValueToOS(corporations.GetCorporationsNum(), objectSyntax);
+        ValueToOS(corporations.Count(), objectSyntax);
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
-        { std::string res; x2str(services.GetCorporationsNum(), res); return res; }
+        { std::string res; x2str(corporations.Count(), res); return res; }
 #endif
 
     private:
         const CORPORATIONS & corporations;
 };
 
+class TotalRulesSensor : public Sensor {
+    public:
+        TotalRulesSensor(const TRAFFCOUNTER & t) : traffcounter(t) {}
+        virtual ~TotalRulesSensor() {}
+
+        bool GetValue(ObjectSyntax_t * objectSyntax) const
+        {
+        ValueToOS(traffcounter.RulesCount(), objectSyntax);
+        return true;
+        }
+
+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(traffcounter.RulesCount(), res); return res; }
+#endif
+
+    private:
+        const TRAFFCOUNTER & traffcounter;
+};
+
 template <typename T>
 class ConstSensor : public Sensor {
     public:
@@ -256,11 +290,13 @@ class ConstSensor : public Sensor {
         T value;
 };
 
+#ifdef DEBUG
 template <>
 inline
 std::string ConstSensor<std::string>::ToString() const
 {
 return value;
 }
+#endif
 
 #endif