X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4a89beb9494451304e34e9a8e226936ac465c536..dd226cecb0cb5dad554ed3adf7bf60d2eb059a30:/projects/stargazer/traffcounter_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index 985de593..5223c5c4 100644 --- a/projects/stargazer/traffcounter_impl.cpp +++ b/projects/stargazer/traffcounter_impl.cpp @@ -97,7 +97,7 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- int TRAFFCOUNTER_IMPL::Start() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!stopped) return 0; @@ -212,7 +212,7 @@ if (monitoring && (touchTimeP + MONITOR_TIME_DELAY_SEC <= stgTime)) TouchFile(monFile.c_str()); } -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); //printfd(__FILE__, "TRAFFCOUNTER::Process()\n"); //TODO replace find with lower_bound. @@ -290,7 +290,7 @@ if (ed.userUPresent || //----------------------------------------------------------------------------- void TRAFFCOUNTER_IMPL::FlushAndRemove() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); Packets::size_type oldPacketsSize = packets.size(); Index::size_type oldIp2packetsSize = ip2packets.size(); @@ -377,7 +377,7 @@ printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str()); uint32_t uip = user->GetCurrIP(); std::pair pi; -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); // Find all packets with IP belongs to this user pi = ip2packets.equal_range(uip); @@ -414,7 +414,7 @@ void TRAFFCOUNTER_IMPL::DelUser(uint32_t uip) printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str()); std::pair pi; -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); pi = ip2packets.equal_range(uip); while (pi.first != pi.second) @@ -717,7 +717,7 @@ return false; //----------------------------------------------------------------------------- int TRAFFCOUNTER_IMPL::Reload() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (ReadRules(true)) {