Merge branch 'naffanya-dev'

[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..f52a413b7aeff6543e3a4ccf32da5e67012cc0cf 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.cpp
+++ b/projects/stargazer/plugins/other/smux/sensors.cpp
@@ -1,4 +1,6 @@
-#include "asn1/INTEGER.h"
+#include <cassert>
+
+#include "stg/INTEGER.h"

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


@@ -7,8 +9,7 @@
 bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const
 {
 int handle = users.OpenSearch();
 bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const
 {
 int handle = users.OpenSearch();

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

 
 USER_PTR user;
 size_t count = 0;
 
 USER_PTR user;
 size_t count = 0;


@@ -23,3 +24,38 @@ users.CloseSearch(handle);
 ValueToOS(count, objectSyntax);
 return true;
 }
 ValueToOS(count, objectSyntax);
 return true;
 }

+
+#ifdef DEBUG
+std::string UsersSensor::ToString() const
+{
+int handle = users.OpenSearch();
+assert(handle && "USERS::OpenSearch is always correct");
+
+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
+
+bool ActiveUsersSensor::UserPredicate(USER_PTR 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;
+}