#include "traffcounter_impl.h"
#include "stg_timer.h"
#include "users_impl.h"
+#include "async_pool.h"
#define FLUSH_TIME (10)
#define REMOVE_TIME (31)
using STG::TraffCounterImpl;
+using STG::TRF_IP_BEFORE;
+using STG::TRF_IP_AFTER;
+using STG::ADD_USER_NONIFIER;
+using STG::DEL_USER_NONIFIER;
+
+namespace AsyncPoolST = STG::AsyncPoolST;
const char protoName[PROTOMAX][8] =
{"TCP", "UDP", "ICMP", "TCP_UDP", "ALL"};
monitoring(false),
touchTimeP(stgTime - MONITOR_TIME_DELAY_SEC),
users(u),
- running(false),
stopped(true),
addUserNotifier(*this),
delUserNotifier(*this)
users->AddNotifierUserAdd(&addUserNotifier);
users->AddNotifierUserDel(&delUserNotifier);
-
-pthread_mutex_init(&mutex, NULL);
}
//-----------------------------------------------------------------------------
TraffCounterImpl::~TraffCounterImpl()
{
-pthread_mutex_destroy(&mutex);
}
//-----------------------------------------------------------------------------
int TraffCounterImpl::Start()
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
if (!stopped)
return 0;
SetUserNotifiers(u);
users->CloseSearch(h);
-running = true;
-if (pthread_create(&thread, NULL, Run, this))
- {
- printfd(__FILE__, "TraffCounterImpl::Start() - Cannot start thread\n");
- WriteServLog("TraffCounter: Error: Cannot start thread.");
- return -1;
- }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
return 0;
}
//-----------------------------------------------------------------------------
if (stopped)
return 0;
-running = false;
+m_thread.request_stop();
int h = users->OpenSearch();
assert(h && "USERS::OpenSearch is always correct");
//5 seconds to thread stops itself
struct timespec ts = {0, 200000000};
for (int i = 0; i < 25 && !stopped; i++)
- {
nanosleep(&ts, NULL);
- }
if (!stopped)
+{
+ m_thread.detach();
return -1;
+}
+
+m_thread.join();
printfd(__FILE__, "TraffCounter::Stop()\n");
return 0;
}
//-----------------------------------------------------------------------------
-void * TraffCounterImpl::Run(void * data)
+void TraffCounterImpl::Run(std::stop_token token)
{
sigset_t signalSet;
sigfillset(&signalSet);
pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-TraffCounterImpl * tc = static_cast<TraffCounterImpl *>(data);
-tc->stopped = false;
+stopped = false;
int c = 0;
time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;
struct timespec ts = {0, 500000000};
-while (tc->running)
+while (!token.stop_requested())
{
nanosleep(&ts, 0);
- if (!tc->running)
+ if (token.stop_requested())
{
- tc->FlushAndRemove();
+ FlushAndRemove();
break;
}
- if (tc->monitoring && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))
+ if (monitoring && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))
{
- std::string monFile(tc->monitorDir + "/traffcounter_r");
- printfd(__FILE__, "Monitor=%d file TraffCounter %s\n", tc->monitoring, monFile.c_str());
+ std::string monFile(monitorDir + "/traffcounter_r");
+ printfd(__FILE__, "Monitor=%d file TraffCounter %s\n", monitoring, monFile.c_str());
touchTime = stgTime;
TouchFile(monFile);
}
if (++c % FLUSH_TIME == 0)
- tc->FlushAndRemove();
+ FlushAndRemove();
}
-tc->stopped = true;
-return NULL;
+stopped = true;
}
//-----------------------------------------------------------------------------
void TraffCounterImpl::process(const RawPacket & rawPacket)
{
-if (!running)
- return;
-
if (monitoring && (touchTimeP + MONITOR_TIME_DELAY_SEC <= stgTime))
{
std::string monFile = monitorDir + "/traffcounter_p";
TouchFile(monFile);
}
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
//printfd(__FILE__, "TraffCounter::Process()\n");
//TODO replace find with lower_bound.
//-----------------------------------------------------------------------------
void TraffCounterImpl::FlushAndRemove()
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
Packets::size_type oldPacketsSize = packets.size();
Index::size_type oldIp2packetsSize = ip2packets.size();
uint32_t uip = user->GetCurrIP();
std::pair<ip2p_iter, ip2p_iter> pi;
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
// Find all packets with IP belongs to this user
pi = ip2packets.equal_range(uip);
printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str());
std::pair<ip2p_iter, ip2p_iter> pi;
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
pi = ip2packets.equal_range(uip);
while (pi.first != pi.second)
//-----------------------------------------------------------------------------
int TraffCounterImpl::Reload()
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
if (ReadRules(true))
{
monitoring = !monitorDir.empty();
}
//-----------------------------------------------------------------------------
+void TRF_IP_BEFORE::notify(const uint32_t & oldValue, const uint32_t &)
+{
+// User changes his address. Remove old IP
+if (!oldValue)
+ return;
+
+AsyncPoolST::enqueue([this, oldValue](){ traffCnt.DelUser(oldValue); });
+}
+//-----------------------------------------------------------------------------
+void TRF_IP_AFTER::notify(const uint32_t &, const uint32_t & newValue)
+{
+// User changes his address. Add new IP
+if (!newValue)
+ return;
+
+AsyncPoolST::enqueue([this](){ traffCnt.AddUser(user); });
+}
+//-----------------------------------------------------------------------------
+void ADD_USER_NONIFIER::notify(const UserImplPtr & user)
+{
+AsyncPoolST::enqueue([this, user](){ traffCnt.SetUserNotifiers(user); });
+}
+//-----------------------------------------------------------------------------
+void DEL_USER_NONIFIER::notify(const UserImplPtr & user)
+{
+AsyncPoolST::enqueue([this, user](){ traffCnt.UnSetUserNotifiers(user); });
+AsyncPoolST::enqueue([this, user](){ traffCnt.DelUser(user->GetCurrIP()); });
+}
+//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff