-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-
+#include <cstdio>
+#include <cassert>
+#include <csignal>
+#include <ctime>
#include <algorithm>
+#include "stg/user.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"
+#include "stg/plugin_creator.h"
#include "ping.h"
-#include "user.h"
-#include "stg_locker.h"
-#include "../../../settings.h"
-#include "../../../user_property.h"
-class PING_CREATOR
+namespace
{
-private:
- PING * ping;
-
-public:
- PING_CREATOR()
- : ping(new PING())
- {
- };
- ~PING_CREATOR()
- {
- delete ping;
- };
+PLUGIN_CREATOR<PING> pc;
- PING * GetPlugin()
- {
- return ping;
- };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PING_CREATOR pc;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
template <typename varType>
-class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>
+class IS_CONTAINS_USER: public std::binary_function<varType, USER_PTR, bool>
{
public:
IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
bool operator()(varType notifier) const
{
return notifier.GetUser() == user;
- };
+ }
private:
const USER_PTR & user;
};
+}
+
+extern "C" PLUGIN * GetPlugin();
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-PING_SETTINGS::PING_SETTINGS()
- : pingDelay(0)
-{
-}
-//-----------------------------------------------------------------------------
int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
{
PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+
std::vector<PARAM_VALUE>::const_iterator pvi;
pv.param = "PingDelay";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'PingDelay\' not found.";
printfd(__FILE__, "Parameter 'PingDelay' not found\n");
return 0;
}
//-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val)
-{
-if (str2x(str.c_str(), *val))
- {
- errorStr = "Incorrect value \'" + str + "\'.";
- return -1;
- }
-if (*val < min || *val > max)
- {
- errorStr = "Value \'" + str + "\' out of range.";
- return -1;
- }
-return 0;
-}
-//-----------------------------------------------------------------------------
PING::PING()
: users(NULL),
nonstop(false),
isRunning(false),
onAddUserNotifier(*this),
- onDelUserNotifier(*this)
+ onDelUserNotifier(*this),
+ logger(GetPluginLogger(GetStgLogger(), "ping"))
{
pthread_mutex_init(&mutex, NULL);
}
pthread_mutex_destroy(&mutex);
}
//-----------------------------------------------------------------------------
-const std::string PING::GetVersion() const
-{
-return "Pinger v.1.01";
-}
-//-----------------------------------------------------------------------------
-void PING::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------
int PING::ParseSettings()
{
int ret = pingSettings.ParseSettings(settings);
return ret;
}
//-----------------------------------------------------------------------------
-void PING::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-const std::string & PING::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
int PING::Start()
{
GetUsers();
if (pthread_create(&thread, NULL, Run, this))
{
errorStr = "Cannot start thread.";
+ logger("Cannot create thread.");
printfd(__FILE__, "Cannot start thread\n");
return -1;
}
//-----------------------------------------------------------------------------
int PING::Stop()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (!isRunning)
return 0;
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);
- }
-
-//after 5 seconds waiting thread still running. now kill it
-if (isRunning)
- {
- printfd(__FILE__, "kill PING thread.\n");
- if (pthread_kill(thread, SIGINT))
- {
- errorStr = "Cannot kill PING thread.";
- printfd(__FILE__, "Cannot kill PING thread.\n");
- return -1;
- }
- printfd(__FILE__, "PING killed\n");
+ nanosleep(&ts, NULL);
}
users->DelNotifierUserAdd(&onAddUserNotifier);
users->DelNotifierUserDel(&onDelUserNotifier);
-list<USER_PTR>::iterator users_iter;
+std::list<USER_PTR>::iterator users_iter;
users_iter = usersList.begin();
while (users_iter != usersList.end())
{
UnSetUserNotifiers(*users_iter);
- users_iter++;
+ ++users_iter;
}
+if (isRunning)
+ return -1;
+
return 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void * PING::Run(void * d)
{
-PING * ping = (PING*)d;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+PING * ping = static_cast<PING *>(d);
ping->isRunning = true;
-list<USER_PTR>::iterator iter;
-uint32_t ip;
-time_t t;
+long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
+
while (ping->nonstop)
{
- iter = ping->usersList.begin();
+ std::list<USER_PTR>::iterator iter = ping->usersList.begin();
{
- STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
+ STG_LOCKER lock(&ping->mutex);
while (iter != ping->usersList.end())
{
if ((*iter)->GetProperty().ips.ConstData().OnlyOneIP())
{
- ip = (*iter)->GetProperty().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;
}
//-----------------------------------------------------------------------------
-uint16_t PING::GetStartPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
-uint16_t PING::GetStopPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
void PING::SetUserNotifiers(USER_PTR u)
{
CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
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;
+std::list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
+std::list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
currIPter = find_if(ChgCurrIPNotifierList.begin(),
ChgCurrIPNotifierList.end(),
//-----------------------------------------------------------------------------
void PING::GetUsers()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
USER_PTR u;
int h = users->OpenSearch();
-if (!h)
- {
- printfd(__FILE__, "users->OpenSearch() error\n");
- return;
- }
+assert(h && "USERS::OpenSearch is always correct");
while (users->SearchNext(h, &u) == 0)
{
//-----------------------------------------------------------------------------
void PING::AddUser(USER_PTR u)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
SetUserNotifiers(u);
usersList.push_back(u);
//-----------------------------------------------------------------------------
void PING::DelUser(USER_PTR u)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
UnSetUserNotifiers(u);
-list<USER_PTR>::iterator users_iter;
+std::list<USER_PTR>::iterator users_iter;
users_iter = usersList.begin();
while (users_iter != usersList.end())
usersList.erase(users_iter);
break;
}
- users_iter++;
+ ++users_iter;
}
}
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff