#include <stdio.h>
-#include <unistd.h>
#include <signal.h>
+#include <ctime>
+#include <algorithm>
+
#include "ping.h"
-#include "../../../user.h"
+#include "user.h"
+#include "stg_locker.h"
+#include "user_property.h"
class PING_CREATOR
{
//-----------------------------------------------------------------------------
// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
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:
- bool operator()(varType notifier, user_iter user) const
+ IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
+ bool operator()(varType notifier) const
{
return notifier.GetUser() == user;
};
+private:
+ const USER_PTR & user;
};
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
{
return pc.GetPlugin();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
PING_SETTINGS::PING_SETTINGS()
- : pingDelay(0),
- errorStr()
+ : pingDelay(0)
{
}
//-----------------------------------------------------------------------------
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.";
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))
{
}
//-----------------------------------------------------------------------------
PING::PING()
+ : users(NULL),
+ nonstop(false),
+ isRunning(false),
+ onAddUserNotifier(*this),
+ onDelUserNotifier(*this)
{
pthread_mutex_init(&mutex, NULL);
-isRunning = false;
}
//-----------------------------------------------------------------------------
PING::~PING()
pthread_mutex_destroy(&mutex);
}
//-----------------------------------------------------------------------------
-const string PING::GetVersion() const
+const std::string PING::GetVersion() const
{
return "Pinger v.1.01";
}
users = u;
}
//-----------------------------------------------------------------------------
-const string & PING::GetStrError() const
+const std::string & PING::GetStrError() const
{
return errorStr;
}
{
GetUsers();
-onAddUserNotifier.SetPinger(this);
-onDelUserNotifier.SetPinger(this);
users->AddNotifierUserAdd(&onAddUserNotifier);
users->AddNotifierUserDel(&onDelUserNotifier);
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
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;
//-----------------------------------------------------------------------------
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)
}
else
{
- ip = (*iter)->GetCurrIP();
+ uint32_t ip = (*iter)->GetCurrIP();
if (ip)
{
+ time_t t;
if (ping->pinger.GetIPTime(ip, &t) == 0)
{
if (t)
}
}
}
- 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;
}
return 100;
}
//-----------------------------------------------------------------------------
-void PING::SetUserNotifiers(user_iter u)
+void PING::SetUserNotifiers(USER_PTR u)
{
-CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier;
-CHG_IPS_NOTIFIER_PING ChgIPNotifier;
+CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
+CHG_IPS_NOTIFIER_PING ChgIPNotifier(*this, u);
-ChgCurrIPNotifier.SetPinger(this);
-ChgCurrIPNotifier.SetUser(u);
ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);
-
-ChgIPNotifier.SetPinger(this);
-ChgIPNotifier.SetUser(u);
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;
-IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP;
+IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
+IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP(u);
-list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
-list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
+list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
+list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
currIPter = find_if(ChgCurrIPNotifierList.begin(),
ChgCurrIPNotifierList.end(),
- bind2nd(IsContainsUserCurrIP, u));
+ IsContainsUserCurrIP);
if (currIPter != ChgCurrIPNotifierList.end())
{
// --- IP ---
IPIter = find_if(ChgIPNotifierList.begin(),
ChgIPNotifierList.end(),
- bind2nd(IsContainsUserIP, u));
+ IsContainsUserIP);
if (IPIter != ChgIPNotifierList.end())
{
- IPIter->GetUser()->property.ips.DelAfterNotifier(&(*IPIter));
+ IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));
ChgIPNotifierList.erase(IPIter);
}
// --- IP end ---
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-user_iter u;
+USER_PTR u;
int h = users->OpenSearch();
if (!h)
{
{
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
{
users->CloseSearch(h);
}
//-----------------------------------------------------------------------------
-void PING::AddUser(user_iter u)
+void PING::AddUser(USER_PTR u)
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
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())
usersList.erase(users_iter);
break;
}
- users_iter++;
+ ++users_iter;
}
}
//-----------------------------------------------------------------------------
void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP)
{
-ping->pinger.DelIP(oldIP);
+ping.pinger.DelIP(oldIP);
if (newIP)
{
- ping->pinger.AddIP(newIP);
+ ping.pinger.AddIP(newIP);
}
}
//-----------------------------------------------------------------------------
{
if (oldIPS.OnlyOneIP())
{
- ping->pinger.DelIP(oldIPS[0].ip);
+ ping.pinger.DelIP(oldIPS[0].ip);
}
if (newIPS.OnlyOneIP())
{
- ping->pinger.AddIP(newIPS[0].ip);
+ ping.pinger.AddIP(newIPS[0].ip);
}
}
//-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const user_iter & user)
+void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)
{
-ping->AddUser(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);
+ping.DelUser(user);
}
//-----------------------------------------------------------------------------
-
-
-
-
-
-
git.stg.codes / stg.git / blobdiff