Fixed problem running plugin in non-debug mode.

[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 dbfb807b34c062c1d8bf1631c5f3f9036f93a010..3787611f4263c3cbfe06fe10fac41f5e751b1e03 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -5,25 +5,28 @@
 
 #include "stg/users.h"
 #include "stg/tariffs.h"
 
 #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/user_property.h"
 

-#include "asn1/ObjectSyntax.h"
+#include "stg/ObjectSyntax.h"

 
 #include "value2os.h"
 #include "types.h"
 
 class Sensor {
     public:
 
 #include "value2os.h"
 #include "types.h"
 
 class Sensor {
     public:

+        virtual ~Sensor() {}

         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;

+#ifdef DEBUG
+        virtual std::string ToString() const = 0;
+#endif

 };
 
 typedef std::map<OID, Sensor *> Sensors;
 
 };
 
 typedef std::map<OID, Sensor *> Sensors;
 

-class TableSensor {
-    public:
-        virtual bool appendTable(Sensors & sensors);
-};
-

 class TotalUsersSensor : public Sensor {
     public:
         TotalUsersSensor(const USERS & u) : users(u) {}
 class TotalUsersSensor : public Sensor {
     public:
         TotalUsersSensor(const USERS & u) : users(u) {}


@@ -31,10 +34,15 @@ class TotalUsersSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(users.GetUserNum(), objectSyntax);
+        ValueToOS(users.Count(), objectSyntax);

         return true;
         }
 
         return true;
         }
 

+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(users.Count(), res); return res; }
+#endif
+

     private:
         const USERS & users;
 };
     private:
         const USERS & users;
 };


@@ -42,9 +50,12 @@ class TotalUsersSensor : public Sensor {
 class UsersSensor : public Sensor {
     public:
         UsersSensor(USERS & u) : users(u) {}
 class UsersSensor : public Sensor {
     public:
         UsersSensor(USERS & u) : users(u) {}

-        virtual ~UsersSensor() {};
+        virtual ~UsersSensor() {}

 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;

+#ifdef DEBUG
+        std::string ToString() const;
+#endif

 
     private:
         USERS & users;
 
     private:
         USERS & users;


@@ -149,7 +160,16 @@ class TariffChangeUsersSensor : public UsersSensor {
 
     private:
         bool UserPredicate(USER_PTR userPtr) const
 
     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 {
 };
 
 class TotalTariffsSensor : public Sensor {


@@ -159,14 +179,99 @@ class TotalTariffsSensor : public Sensor {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(tariffs.GetTariffsNum(), objectSyntax);
+        ValueToOS(tariffs.Count(), objectSyntax);

         return true;
         }
 
         return true;
         }
 

+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(tariffs.Count(), res); return res; }
+#endif
+

     private:
         const TARIFFS & tariffs;
 };
 
     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:
 template <typename T>
 class ConstSensor : public Sensor {
     public:


@@ -176,8 +281,22 @@ class ConstSensor : public Sensor {
         bool GetValue(ObjectSyntax * objectSyntax) const
         { return ValueToOS(value, objectSyntax); }
 
         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;
 };
 
     private:
         T value;
 };
 

+#ifdef DEBUG
+template <>
+inline
+std::string ConstSensor<std::string>::ToString() const
+{
+return value;
+}
+#endif
+

 #endif
 #endif