From: Maxim Mamontov Date: Mon, 8 Aug 2011 18:30:24 +0000 (+0300) Subject: String coversion added to the sensors for debugging purpoces X-Git-Tag: 2.408-alpha~43 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/5f2937099a707ddb360954f5c10fe79cfa906110 String coversion added to the sensors for debugging purpoces --- diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp index 7721d7b7..6018566c 100644 --- a/projects/stargazer/plugins/other/smux/sensors.cpp +++ b/projects/stargazer/plugins/other/smux/sensors.cpp @@ -23,3 +23,26 @@ users.CloseSearch(handle); ValueToOS(count, objectSyntax); return true; } + +#ifdef DEBUG +std::string UsersSensor::ToString() const +{ +int handle = users.OpenSearch(); +if (!handle) + return ""; + +USER_PTR user; +size_t count = 0; +while (!users.SearchNext(handle, &user)) + { + if (UserPredicate(user)) + ++count; + } + +users.CloseSearch(handle); + +std::string res; +x2str(count, res); +return res; +} +#endif diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h index 37bd2020..f2840636 100644 --- a/projects/stargazer/plugins/other/smux/sensors.h +++ b/projects/stargazer/plugins/other/smux/sensors.h @@ -15,15 +15,13 @@ class Sensor { public: virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0; +#ifdef DEBUG + virtual std::string ToString() const = 0; +#endif }; typedef std::map Sensors; -class TableSensor { - public: - virtual bool appendTable(Sensors & sensors); -}; - class TotalUsersSensor : public Sensor { public: TotalUsersSensor(const USERS & u) : users(u) {} @@ -35,6 +33,11 @@ class TotalUsersSensor : public Sensor { return true; } +#ifdef DEBUG + std::string ToString() const + { std::string res; x2str(users.GetUserNum(), res); return res; } +#endif + private: const USERS & users; }; @@ -42,9 +45,12 @@ class TotalUsersSensor : public Sensor { class UsersSensor : public Sensor { public: UsersSensor(USERS & u) : users(u) {} - virtual ~UsersSensor() {}; + virtual ~UsersSensor() {} bool GetValue(ObjectSyntax_t * objectSyntax) const; +#ifdef DEBUG + std::string ToString() const; +#endif private: USERS & users; @@ -163,6 +169,11 @@ class TotalTariffsSensor : public Sensor { return true; } +#ifdef DEBUG + std::string ToString() const + { std::string res; x2str(tariffs.GetTariffsNum(), res); return res; } +#endif + private: const TARIFFS & tariffs; }; @@ -176,8 +187,20 @@ 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; }; +template <> +inline +std::string ConstSensor::ToString() const +{ +return value; +} + #endif