Minor ChangeLog fix

[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 085a2ddd2a50bb80bac12d0f4b13c5ebb7b6c8b8..3787611f4263c3cbfe06fe10fac41f5e751b1e03 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -1,22 +1,31 @@
 #ifndef __SENSORS_H__
 #define __SENSORS_H__
 
-#include <string>
 #include <map>
 
 #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 "asn1/ObjectSyntax.h"
+#include "stg/ObjectSyntax.h"
 
 #include "value2os.h"
+#include "types.h"
 
 class Sensor {
     public:
+        virtual ~Sensor() {}
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
+#ifdef DEBUG
+        virtual std::string ToString() const = 0;
+#endif
 };
 
-typedef std::map<std::string, Sensor *> Sensors;
+typedef std::map<OID, Sensor *> Sensors;
 
 class TotalUsersSensor : public Sensor {
     public:
@@ -25,122 +34,142 @@ 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.Count(), res); return res; }
+#endif
+
     private:
         const USERS & users;
 };
 
-class ConnectedUsersSensor : public Sensor {
+class UsersSensor : public Sensor {
     public:
-        ConnectedUsersSensor(USERS & u) : users(u) {}
-        virtual ~ConnectedUsersSensor() {}
+        UsersSensor(USERS & u) : users(u) {}
+        virtual ~UsersSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;
+#ifdef DEBUG
+        std::string ToString() const;
+#endif
 
     private:
         USERS & users;
+
+        virtual bool UserPredicate(USER_PTR userPtr) const = 0;
 };
 
-class AuthorizedUsersSensor : public Sensor {
+class ConnectedUsersSensor : public UsersSensor {
     public:
-        AuthorizedUsersSensor(USERS & u) : users(u) {}
-        virtual ~AuthorizedUsersSensor() {}
+        ConnectedUsersSensor(USERS & u) : UsersSensor(u) {}
+        virtual ~ConnectedUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
+    private:
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetConnected(); }
+};
+
+class AuthorizedUsersSensor : public UsersSensor {
+    public:
+        AuthorizedUsersSensor(USERS & u) : UsersSensor(u) {}
+        virtual ~AuthorizedUsersSensor() {}
 
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetAuthorized(); }
 };
 
-class AlwaysOnlineUsersSensor : public Sensor {
+class AlwaysOnlineUsersSensor : public UsersSensor {
     public:
-        AlwaysOnlineUsersSensor(USERS & u) : users(u) {}
+        AlwaysOnlineUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~AlwaysOnlineUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().alwaysOnline; }
 };
 
-class NoCashUsersSensor : public Sensor {
+class NoCashUsersSensor : public UsersSensor {
     public:
-        NoCashUsersSensor(USERS & u) : users(u) {}
+        NoCashUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~NoCashUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().cash < 0; }
 };
 
-class DisabledDetailStatsUsersSensor : public Sensor {
+class DisabledDetailStatsUsersSensor : public UsersSensor {
     public:
-        DisabledDetailStatsUsersSensor(USERS & u) : users(u) {}
+        DisabledDetailStatsUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~DisabledDetailStatsUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().disabledDetailStat; }
 };
 
-class DisabledUsersSensor : public Sensor {
+class DisabledUsersSensor : public UsersSensor {
     public:
-        DisabledUsersSensor(USERS & u) : users(u) {}
+        DisabledUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~DisabledUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().disabled; }
 };
 
-class PassiveUsersSensor : public Sensor {
+class PassiveUsersSensor : public UsersSensor {
     public:
-        PassiveUsersSensor(USERS & u) : users(u) {}
+        PassiveUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~PassiveUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().passive; }
 };
 
-class CreditUsersSensor : public Sensor {
+class CreditUsersSensor : public UsersSensor {
     public:
-        CreditUsersSensor(USERS & u) : users(u) {}
+        CreditUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~CreditUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().credit > 0; }
 };
 
-class FreeMbUsersSensor : public Sensor {
+class FreeMbUsersSensor : public UsersSensor {
     public:
-        FreeMbUsersSensor(USERS & u) : users(u) {}
+        FreeMbUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~FreeMbUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
-
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const
+        { return userPtr->GetProperty().freeMb > 0; }
 };
 
-class TariffChangeUsersSensor : public Sensor {
+class TariffChangeUsersSensor : public UsersSensor {
     public:
-        TariffChangeUsersSensor(USERS & u) : users(u) {}
+        TariffChangeUsersSensor(USERS & u) : UsersSensor(u) {}
         virtual ~TariffChangeUsersSensor() {}
 
-        bool GetValue(ObjectSyntax_t * objectSyntax) const;
+    private:
+        bool UserPredicate(USER_PTR userPtr) const
+        { return !userPtr->GetProperty().nextTariff.ConstData().empty(); }
+};
+
+class ActiveUsersSensor : public UsersSensor {
+    public:
+        ActiveUsersSensor(USERS & u) : UsersSensor(u) {}
+        virtual ~ActiveUsersSensor() {}
 
     private:
-        USERS & users;
+        bool UserPredicate(USER_PTR userPtr) const;
 };
 
 class TotalTariffsSensor : public Sensor {
@@ -150,14 +179,99 @@ 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.Count(), res); return res; }
+#endif
+
     private:
         const TARIFFS & tariffs;
 };
 
+class TotalAdminsSensor : public Sensor {
+    public:
+        TotalAdminsSensor(const ADMINS & a) : admins(a) {}
+        virtual ~TotalAdminsSensor() {}
+
+        bool GetValue(ObjectSyntax_t * objectSyntax) const
+        {
+        ValueToOS(admins.Count(), objectSyntax);
+        return true;
+        }
+
+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(admins.Count(), res); return res; }
+#endif
+
+    private:
+        const ADMINS & admins;
+};
+
+class TotalServicesSensor : public Sensor {
+    public:
+        TotalServicesSensor(const SERVICES & s) : services(s) {}
+        virtual ~TotalServicesSensor() {}
+
+        bool GetValue(ObjectSyntax_t * objectSyntax) const
+        {
+        ValueToOS(services.Count(), objectSyntax);
+        return true;
+        }
+
+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(services.Count(), res); return res; }
+#endif
+
+    private:
+        const SERVICES & services;
+};
+
+class TotalCorporationsSensor : public Sensor {
+    public:
+        TotalCorporationsSensor(const CORPORATIONS & c) : corporations(c) {}
+        virtual ~TotalCorporationsSensor() {}
+
+        bool GetValue(ObjectSyntax_t * objectSyntax) const
+        {
+        ValueToOS(corporations.Count(), objectSyntax);
+        return true;
+        }
+
+#ifdef DEBUG
+        std::string ToString() const
+        { 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:
@@ -167,8 +281,22 @@ class ConstSensor : public Sensor {
         bool GetValue(ObjectSyntax * objectSyntax) const
         { return ValueToOS(value, objectSyntax); }
 
+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(value, res); return res; }
+#endif
+
     private:
         T value;
 };
 
+#ifdef DEBUG
+template <>
+inline
+std::string ConstSensor<std::string>::ToString() const
+{
+return value;
+}
+#endif
+
 #endif