Ticket 12. The 'stopOnError(rval.stopOnError)' property added in the SETTINGS_IMPL()

[stg.git] / stglibs / pinger.lib / pinger.cpp

diff --git a/stglibs/pinger.lib/pinger.cpp b/stglibs/pinger.lib/pinger.cpp
index edc8c174c7fb06a831707aba2d9e5876e7b23955..1689e29403b89c6dd22a0d88fb5dd491d0ec055e 100644 (file)
--- a/stglibs/pinger.lib/pinger.cpp
+++ b/stglibs/pinger.lib/pinger.cpp
@@ -123,19 +123,19 @@ return 0;
 //-----------------------------------------------------------------------------
 void STG_PINGER::AddIP(uint32_t ip)
 {
 //-----------------------------------------------------------------------------
 void STG_PINGER::AddIP(uint32_t ip)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 ipToAdd.push_back(ip);
 }
 //-----------------------------------------------------------------------------
 void STG_PINGER::DelIP(uint32_t ip)
 {
 ipToAdd.push_back(ip);
 }
 //-----------------------------------------------------------------------------
 void STG_PINGER::DelIP(uint32_t ip)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 ipToDel.push_back(ip);
 }
 //-----------------------------------------------------------------------------
 void STG_PINGER::RealAddIP()
 {
 ipToDel.push_back(ip);
 }
 //-----------------------------------------------------------------------------
 void STG_PINGER::RealAddIP()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 std::list<uint32_t>::iterator iter;
 iter = ipToAdd.begin();
 
 std::list<uint32_t>::iterator iter;
 iter = ipToAdd.begin();


@@ -149,7 +149,7 @@ ipToAdd.erase(ipToAdd.begin(), ipToAdd.end());
 //-----------------------------------------------------------------------------
 void STG_PINGER::RealDelIP()
 {
 //-----------------------------------------------------------------------------
 void STG_PINGER::RealDelIP()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 std::list<uint32_t>::iterator iter;
 std::multimap<uint32_t, time_t>::iterator treeIter;
 
 std::list<uint32_t>::iterator iter;
 std::multimap<uint32_t, time_t>::iterator treeIter;


@@ -167,7 +167,7 @@ ipToDel.erase(ipToDel.begin(), ipToDel.end());
 //-----------------------------------------------------------------------------
 void STG_PINGER::PrintAllIP()
 {
 //-----------------------------------------------------------------------------
 void STG_PINGER::PrintAllIP()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 std::multimap<uint32_t, time_t>::iterator iter;
 iter = pingIP.begin();
 while (iter != pingIP.end())
 std::multimap<uint32_t, time_t>::iterator iter;
 iter = pingIP.begin();
 while (iter != pingIP.end())


@@ -184,7 +184,7 @@ while (iter != pingIP.end())
 //-----------------------------------------------------------------------------
 int STG_PINGER::GetIPTime(uint32_t ip, time_t * t) const
 {
 //-----------------------------------------------------------------------------
 int STG_PINGER::GetIPTime(uint32_t ip, time_t * t) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 std::multimap<uint32_t, time_t>::const_iterator treeIter;
 
 treeIter = pingIP.find(ip);
 std::multimap<uint32_t, time_t>::const_iterator treeIter;
 
 treeIter = pingIP.find(ip);