From 2dd96d1468a065ebee3e37b1defcf2c438d72e2f Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 25 Jul 2011 20:57:37 +0300 Subject: [PATCH] Use common filtering algorithm with predicate specialization --- .../stargazer/plugins/other/smux/sensors.cpp | 185 +----------------- .../stargazer/plugins/other/smux/sensors.h | 105 +++++----- 2 files changed, 59 insertions(+), 231 deletions(-) diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp index 5a8e967a..48809032 100644 --- a/projects/stargazer/plugins/other/smux/sensors.cpp +++ b/projects/stargazer/plugins/other/smux/sensors.cpp @@ -1,11 +1,10 @@ #include "asn1/INTEGER.h" #include "stg/user.h" -#include "stg/user_property.h" #include "sensors.h" -bool ConnectedUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const +bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const { int handle = users.OpenSearch(); if (!handle) @@ -15,187 +14,7 @@ USER_PTR user; size_t count = 0; while (!users.SearchNext(handle, &user)) { - if (user->GetConnected()) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool AuthorizedUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetAuthorized()) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool AlwaysOnlineUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().alwaysOnline) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool NoCashUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().cash < 0) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool DisabledDetailStatsUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().disabledDetailStat) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool DisabledUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().disabled) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool PassiveUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().passive) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool CreditUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().credit > 0) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool FreeMbUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (user->GetProperty().freeMb > 0) - ++count; - } - -users.CloseSearch(handle); - -ValueToOS(count, objectSyntax); -return true; -} - -bool TariffChangeUsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const -{ -int handle = users.OpenSearch(); -if (!handle) - return false; - -USER_PTR user; -size_t count = 0; -while (!users.SearchNext(handle, &user)) - { - if (!user->GetProperty().nextTariff.ConstData().empty()) + if (UserPredicate(user)) ++count; } diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h index 085a2ddd..be53762b 100644 --- a/projects/stargazer/plugins/other/smux/sensors.h +++ b/projects/stargazer/plugins/other/smux/sensors.h @@ -6,6 +6,7 @@ #include "stg/users.h" #include "stg/tariffs.h" +#include "stg/user_property.h" #include "asn1/ObjectSyntax.h" @@ -18,6 +19,11 @@ class Sensor { typedef std::map Sensors; +class TableSensor { + public: + virtual bool appendTable(Sensors & sensors); +}; + class TotalUsersSensor : public Sensor { public: TotalUsersSensor(const USERS & u) : users(u) {} @@ -33,114 +39,117 @@ class TotalUsersSensor : public Sensor { 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; 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: - USERS & users; + bool UserPredicate(USER_PTR userPtr) const + { return userPtr->GetProperty().nextTariff.ConstData().empty(); } }; class TotalTariffsSensor : public Sensor { -- 2.44.2