Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / other / smux / sensors.cpp

diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp
index 48809032d7b9dcc35c30b966af98d59359b6d69d..d868e37bafc56f88739cd452c1e93a7528421b24 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.cpp
+++ b/projects/stargazer/plugins/other/smux/sensors.cpp
@@ -1,16 +1,20 @@
-#include "asn1/INTEGER.h"
+#include "sensors.h"

 
 #include "stg/user.h"
 
 
 #include "stg/user.h"
 

-#include "sensors.h"
+#include <cassert>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include "stg/INTEGER.h"
+#pragma GCC diagnostic pop

 
 

-bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const
+void UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const

 {
 int handle = users.OpenSearch();
 {
 int handle = users.OpenSearch();

-if (!handle)
-    return false;
+assert(handle && "USERS::OpenSearch is always correct");

 
 

-USER_PTR user;
+STG::User* user;

 size_t count = 0;
 while (!users.SearchNext(handle, &user))
     {
 size_t count = 0;
 while (!users.SearchNext(handle, &user))
     {


@@ -21,5 +25,37 @@ while (!users.SearchNext(handle, &user))
 users.CloseSearch(handle);
 
 ValueToOS(count, objectSyntax);
 users.CloseSearch(handle);
 
 ValueToOS(count, objectSyntax);

-return true;
+}
+
+#ifdef DEBUG
+std::string UsersSensor::ToString() const
+{
+int handle = users.OpenSearch();
+assert(handle && "USERS::OpenSearch is always correct");
+
+STG::User* user;
+size_t count = 0;
+while (!users.SearchNext(handle, &user))
+    {
+    if (UserPredicate(user))
+        ++count;
+    }
+
+users.CloseSearch(handle);
+
+return std::to_string(count);
+}
+#endif
+
+bool ActiveUsersSensor::UserPredicate(STG::User* userPtr) const
+{
+if (!userPtr->GetConnected())
+    return false;
+for (size_t i = 0; i < DIR_NUM; ++i)
+    {
+    if (userPtr->GetSessionUpload()[i] > 0 ||
+        userPtr->GetSessionDownload()[i] > 0)
+        return true;
+    }
+return false;

 }
 }