Fix convertor compilation errors

[stg.git] / projects / stargazer / plugins / other / ping / ping.cpp

diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp
index 79d1f4f71b46d01e034c75c53aa17d51e249043b..5f87a99fcf76dcb69c39538d58a905b823ff5d9d 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -1,9 +1,13 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <signal.h>
 
+#include <ctime>
+#include <algorithm>
+
+#include "stg/user.h"
+#include "stg/stg_locker.h"
+#include "stg/user_property.h"
 #include "ping.h"
-#include "../../../user.h"
 
 class PING_CREATOR
 {
@@ -34,21 +38,21 @@ PING_CREATOR pc;
 //-----------------------------------------------------------------------------
 // ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
 template <typename varType>
-class IS_CONTAINS_USER: public binary_function<varType, user_iter, bool>
+class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>
 {
 public:
-    IS_CONTAINS_USER(const user_iter & u) : user(u) {}
+    IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
     bool operator()(varType notifier) const
         {
         return notifier.GetUser() == user;
         };
 private:
-    const user_iter & user;
+    const USER_PTR & user;
 };
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
 {
 return pc.GetPlugin();
 }
@@ -66,7 +70,7 @@ PARAM_VALUE pv;
 vector<PARAM_VALUE>::const_iterator pvi;
 
 pv.param = "PingDelay";
-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'PingDelay\' not found.";
@@ -83,7 +87,7 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay))
 return 0;
 }
 //-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val)
+int PING_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val)
 {
 if (str2x(str.c_str(), *val))
     {
@@ -113,7 +117,7 @@ PING::~PING()
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
-const string PING::GetVersion() const
+const std::string PING::GetVersion() const
 {
 return "Pinger v.1.01";
 }
@@ -136,7 +140,7 @@ void PING::SetUsers(USERS * u)
 users = u;
 }
 //-----------------------------------------------------------------------------
-const string & PING::GetStrError() const
+const std::string & PING::GetStrError() const
 {
 return errorStr;
 }
@@ -173,12 +177,13 @@ if (!isRunning)
 pinger.Stop();
 nonstop = false;
 //5 seconds to thread stops itself
+struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
 
-    usleep(200000);
+    nanosleep(&ts, NULL);
     }
 
 //after 5 seconds waiting thread still running. now kill it
@@ -197,12 +202,12 @@ if (isRunning)
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
-list<user_iter>::iterator users_iter;
+list<USER_PTR>::iterator users_iter;
 users_iter = usersList.begin();
 while (users_iter != usersList.end())
     {
     UnSetUserNotifiers(*users_iter);
-    users_iter++;
+    ++users_iter;
     }
 
 return 0;
@@ -215,22 +220,22 @@ return isRunning;
 //-----------------------------------------------------------------------------
 void * PING::Run(void * d)
 {
-PING * ping = (PING*)d;
+PING * ping = (PING *)d;
 ping->isRunning = true;
-list<user_iter>::iterator iter;
-uint32_t ip;
-time_t t;
 
+long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
+ 
 while (ping->nonstop)
     {
-    iter = ping->usersList.begin();
+    list<USER_PTR>::iterator iter = ping->usersList.begin();
         {
         STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
         while (iter != ping->usersList.end())
             {
-            if ((*iter)->property.ips.ConstData().OnlyOneIP())
+            if ((*iter)->GetProperty().ips.ConstData().OnlyOneIP())
                 {
-                ip = (*iter)->property.ips.ConstData()[0].ip;
+                uint32_t ip = (*iter)->GetProperty().ips.ConstData()[0].ip;
+                time_t t;
                 if (ping->pinger.GetIPTime(ip, &t) == 0)
                     {
                     if (t)
@@ -239,9 +244,10 @@ while (ping->nonstop)
                 }
             else
                 {
-                ip = (*iter)->GetCurrIP();
+                uint32_t ip = (*iter)->GetCurrIP();
                 if (ip)
                     {
+                    time_t t;
                     if (ping->pinger.GetIPTime(ip, &t) == 0)
                         {
                         if (t)
@@ -249,17 +255,19 @@ while (ping->nonstop)
                         }
                     }
                 }
-            iter++;
+            ++iter;
             }
         }
+    struct timespec ts = {delay / 1000000000, delay % 1000000000};
     for (int i = 0; i < 100; i++)
         {
         if (ping->nonstop)
             {
-            usleep((10000*ping->pingSettings.GetPingDelay())/3 + 50000);
+            nanosleep(&ts, NULL);
             }
         }
     }
+
 ping->isRunning = false;
 return NULL;
 }
@@ -274,7 +282,7 @@ uint16_t PING::GetStopPosition() const
 return 100;
 }
 //-----------------------------------------------------------------------------
-void PING::SetUserNotifiers(user_iter u)
+void PING::SetUserNotifiers(USER_PTR u)
 {
 CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
 CHG_IPS_NOTIFIER_PING ChgIPNotifier(*this, u);
@@ -283,10 +291,10 @@ ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);
 ChgIPNotifierList.push_front(ChgIPNotifier);
 
 u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));
-u->property.ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
+u->GetProperty().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
 }
 //-----------------------------------------------------------------------------
-void PING::UnSetUserNotifiers(user_iter u)
+void PING::UnSetUserNotifiers(USER_PTR u)
 {
 // ---          CurrIP              ---
 IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
@@ -313,7 +321,7 @@ IPIter = find_if(ChgIPNotifierList.begin(),
 
 if (IPIter != ChgIPNotifierList.end())
     {
-    IPIter->GetUser()->property.ips.DelAfterNotifier(&(*IPIter));
+    IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));
     ChgIPNotifierList.erase(IPIter);
     }
 // ---          IP end          ---
@@ -323,7 +331,7 @@ void PING::GetUsers()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
-user_iter u;
+USER_PTR u;
 int h = users->OpenSearch();
 if (!h)
     {
@@ -335,9 +343,9 @@ while (users->SearchNext(h, &u) == 0)
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
-    if (u->property.ips.ConstData().OnlyOneIP())
+    if (u->GetProperty().ips.ConstData().OnlyOneIP())
         {
-        pinger.AddIP(u->property.ips.ConstData()[0].ip);
+        pinger.AddIP(u->GetProperty().ips.ConstData()[0].ip);
         }
     else
         {
@@ -352,7 +360,7 @@ while (users->SearchNext(h, &u) == 0)
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
-void PING::AddUser(user_iter u)
+void PING::AddUser(USER_PTR u)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
@@ -360,13 +368,13 @@ SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------
-void PING::DelUser(user_iter u)
+void PING::DelUser(USER_PTR u)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 UnSetUserNotifiers(u);
 
-list<user_iter>::iterator users_iter;
+list<USER_PTR>::iterator users_iter;
 users_iter = usersList.begin();
 
 while (users_iter != usersList.end())
@@ -376,7 +384,7 @@ while (users_iter != usersList.end())
         usersList.erase(users_iter);
         break;
         }
-    users_iter++;
+    ++users_iter;
     }
 }
 //-----------------------------------------------------------------------------
@@ -402,12 +410,12 @@ if (newIPS.OnlyOneIP())
     }
 }
 //-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const user_iter & user)
+void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)
 {
 ping.AddUser(user);
 }
 //-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const user_iter & user)
+void DEL_USER_NONIFIER_PING::Notify(const USER_PTR & user)
 {
 ping.DelUser(user);
 }