Merge branch 'master' of gitorious.org:stg/stg

[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 55780987169eb89e844098d13f213e5d81285843..3787611f4263c3cbfe06fe10fac41f5e751b1e03 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -8,6 +8,7 @@
 #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"
@@ -17,6 +18,7 @@
 
 class Sensor {
     public:
+        virtual ~Sensor() {}
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
 #ifdef DEBUG
         virtual std::string ToString() const = 0;
@@ -158,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 {
@@ -241,6 +252,26 @@ class TotalCorporationsSensor : public Sensor {
         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:
@@ -259,11 +290,13 @@ class ConstSensor : public Sensor {
         T value;
 };
 
+#ifdef DEBUG
 template <>
 inline
 std::string ConstSensor<std::string>::ToString() const
 {
 return value;
 }
+#endif
 
 #endif