* Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
*/
-/*
- $Revision: 1.61 $
- $Date: 2010/09/13 05:56:42 $
- $Author: faust $
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
#include <pthread.h>
#include <csignal>
#include "stg/settings.h"
#include "stg/common.h"
+
#include "users_impl.h"
#include "stg_timer.h"
extern volatile time_t stgTime;
-//#define USERS_DEBUG 1
+using STG::UsersImpl;
//-----------------------------------------------------------------------------
-USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)
- : USERS(),
- users(),
- usersToDelete(),
- /*userIPNotifiersBefore(),
- userIPNotifiersAfter(),*/
- ipIndex(),
- loginIndex(),
- settings(s),
+UsersImpl::UsersImpl(SettingsImpl * s, Store * st,
+ Tariffs * t, Services & svcs,
+ const Admin& sa)
+ : settings(s),
tariffs(t),
+ m_services(svcs),
store(st),
sysAdmin(sa),
- WriteServLog(GetStgLogger()),
+ WriteServLog(Logger::get()),
nonstop(false),
isRunning(false),
- mutex(),
- thread(),
- handle(0),
- searchDescriptors(),
- onAddNotifiers(),
- onDelNotifiers(),
- onAddNotifiersImpl(),
- onDelNotifiersImpl()
+ handle(0)
{
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutex_init(&mutex, &attr);
}
//-----------------------------------------------------------------------------
-USERS_IMPL::~USERS_IMPL()
+UsersImpl::~UsersImpl()
{
pthread_mutex_destroy(&mutex);
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByNameNonLock(const std::string & login, user_iter * user)
+int UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)
{
const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
if (iter == loginIndex.end())
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByNameNonLock(const std::string & login, const_user_iter * user) const
+int UsersImpl::FindByNameNonLock(const std::string & login, const_user_iter * user) const
{
const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
if (iter == loginIndex.end())
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
+int UsersImpl::FindByName(const std::string & login, UserPtr * user)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
user_iter u;
if (FindByNameNonLock(login, &u))
return -1;
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const
+int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
const_user_iter u;
if (FindByNameNonLock(login, &u))
return -1;
return 0;
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::TariffInUse(const std::string & tariffName) const
+bool UsersImpl::Exists(const std::string & login) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-std::list<USER_IMPL>::const_iterator iter;
+STG_LOCKER lock(&mutex);
+const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+return iter != loginIndex.end();
+}
+//-----------------------------------------------------------------------------
+bool UsersImpl::TariffInUse(const std::string & tariffName) const
+{
+STG_LOCKER lock(&mutex);
+std::list<UserImpl>::const_iterator iter;
iter = users.begin();
while (iter != users.end())
{
- if (iter->GetProperty().tariffName.Get() == tariffName)
+ if (iter->GetProperties().tariffName.Get() == tariffName)
return true;
++iter;
}
return false;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::Add(const std::string & login, const ADMIN * admin)
+int UsersImpl::Add(const std::string & login, const Admin * admin)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const PRIV * priv = admin->GetPriv();
+STG_LOCKER lock(&mutex);
+const auto& priv = admin->priv();
-if (!priv->userAddDel)
+if (!priv.userAddDel)
{
WriteServLog("%s tried to add user \'%s\'. Access denied.",
- admin->GetLogStr().c_str(), login.c_str());
- /*errorStr = "Admin \'" + admin->GetLogin() +
- "\': tried to add user \'" + ud->login + "\'. Access denied.";*/
+ admin->logStr().c_str(), login.c_str());
return -1;
}
-//////
if (store->AddUser(login))
- {
- //TODO
- //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.",
- // admin->GetLogin().c_str(), ud->login.c_str());
return -1;
- }
-//////
-
-USER_IMPL u(settings, store, tariffs, sysAdmin, this);
-
-/*struct tm * tms;
-time_t t = stgTime;
-
-tms = localtime(&t);
-
-tms->tm_hour = 0;
-tms->tm_min = 0;
-tms->tm_sec = 0;
-if (settings->GetDayResetTraff() > tms->tm_mday)
- tms->tm_mon -= 1;
-
-tms->tm_mday = settings->GetDayResetTraff();*/
+UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);
u.SetLogin(login);
u.WriteStat();
WriteServLog("%s User \'%s\' added.",
- admin->GetLogStr().c_str(), login.c_str());
+ admin->logStr().c_str(), login.c_str());
u.OnAdd();
{
// Fire all "on add" notifiers
- std::set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onAddNotifiers.begin();
+ std::set<NotifierBase<UserPtr> *>::iterator ni = onAddNotifiers.begin();
while (ni != onAddNotifiers.end())
{
(*ni)->Notify(&users.front());
{
// Fire all "on add" implementation notifiers
- std::set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onAddNotifiersImpl.begin();
+ std::set<NotifierBase<UserImplPtr> *>::iterator ni = onAddNotifiersImpl.begin();
while (ni != onAddNotifiersImpl.end())
{
(*ni)->Notify(&users.front());
return 0;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::Del(const std::string & login, const ADMIN * admin)
+void UsersImpl::Del(const std::string & login, const Admin * admin)
{
-const PRIV * priv = admin->GetPriv();
+const auto& priv = admin->priv();
user_iter u;
-if (!priv->userAddDel)
+if (!priv.userAddDel)
{
WriteServLog("%s tried to remove user \'%s\'. Access denied.",
- admin->GetLogStr().c_str(), login.c_str());
+ admin->logStr().c_str(), login.c_str());
return;
}
{
- STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+ STG_LOCKER lock(&mutex);
if (FindByNameNonLock(login, &u))
{
WriteServLog("%s tried to delete user \'%s\': not found.",
- admin->GetLogStr().c_str(),
+ admin->logStr().c_str(),
login.c_str());
return;
}
}
{
- std::set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onDelNotifiers.begin();
+ std::set<NotifierBase<UserPtr> *>::iterator ni = onDelNotifiers.begin();
while (ni != onDelNotifiers.end())
{
(*ni)->Notify(&(*u));
}
{
- std::set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onDelNotifiersImpl.begin();
+ std::set<NotifierBase<UserImplPtr> *>::iterator ni = onDelNotifiersImpl.begin();
while (ni != onDelNotifiersImpl.end())
{
(*ni)->Notify(&(*u));
}
{
- STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+ STG_LOCKER lock(&mutex);
u->OnDelete();
DelUserFromIndexes(u);
WriteServLog("%s User \'%s\' deleted.",
- admin->GetLogStr().c_str(), login.c_str());
+ admin->logStr().c_str(), login.c_str());
}
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip,
- uint32_t enabledDirs, const AUTH * auth)
+bool UsersImpl::Authorize(const std::string & login, uint32_t ip,
+ uint32_t enabledDirs, const Auth * auth)
{
user_iter iter;
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (FindByNameNonLock(login, &iter))
{
WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
return true;
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::Unauthorize(const std::string & login,
- const AUTH * auth,
+bool UsersImpl::Unauthorize(const std::string & login,
+ const Auth * auth,
const std::string & reason)
{
user_iter iter;
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (FindByNameNonLock(login, &iter))
{
WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
+ printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());
return false;
}
return true;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::ReadUsers()
+int UsersImpl::ReadUsers()
{
std::vector<std::string> usersList;
usersList.clear();
user_iter ui;
+unsigned errors = 0;
for (unsigned int i = 0; i < usersList.size(); i++)
{
- USER_IMPL u(settings, store, tariffs, sysAdmin, this);
+ UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);
u.SetLogin(usersList[i]);
users.push_front(u);
AddUserIntoIndexes(ui);
- if (ui->ReadConf() < 0)
- return -1;
+ if (settings->GetStopOnError())
+ {
+ if (ui->ReadConf() < 0)
+ return -1;
- if (ui->ReadStat() < 0)
- return -1;
+ if (ui->ReadStat() < 0)
+ return -1;
+ }
+ else
+ {
+ if (ui->ReadConf() < 0)
+ errors++;
+
+ if (ui->ReadStat() < 0)
+ errors++;
+ }
}
+if (errors > 0)
+ return -1;
return 0;
}
//-----------------------------------------------------------------------------
-void * USERS_IMPL::Run(void * d)
+void * UsersImpl::Run(void * d)
{
sigset_t signalSet;
sigfillset(&signalSet);
pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());
-USERS_IMPL * us = static_cast<USERS_IMPL *>(d);
+UsersImpl * us = static_cast<UsersImpl *>(d);
struct tm t;
time_t tt = stgTime;
//printfd(__FILE__,"New Minute. old = %02d current = %02d\n", min, t->tm_min);
//printfd(__FILE__,"New Day. old = %2d current = %2d\n", day, t->tm_mday);
- for_each(us->users.begin(), us->users.end(), std::mem_fun_ref(&USER_IMPL::Run));
+ for_each(us->users.begin(), us->users.end(), [](auto& user){ user.Run(); });
tt = stgTime;
localtime_r(&tt, &t);
{
//printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
touchTime = stgTime;
- TouchFile(monFile.c_str());
+ TouchFile(monFile);
}
stgUsleep(100000);
} //while (us->nonstop)
-user_iter ui = us->users.begin();
-while (ui != us->users.end())
- {
- us->DelUserFromIndexes(ui);
- ++ui;
- }
-
-std::list<USER_TO_DEL>::iterator iter;
-iter = us->usersToDelete.begin();
+std::list<USER_TO_DEL>::iterator iter(us->usersToDelete.begin());
while (iter != us->usersToDelete.end())
{
iter->delTime -= 2 * userDeleteDelayTime;
return NULL;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::NewMinute(const struct tm & t)
+void UsersImpl::NewMinute(const struct tm & t)
{
//Write traff, reset session traff. Fake disconnect-connect
if (t.tm_hour == 23 && t.tm_min == 59)
{
printfd(__FILE__,"MidnightResetSessionStat\n");
- for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::MidnightResetSessionStat));
+ for_each(users.begin(), users.end(), [](auto& user){ user.MidnightResetSessionStat(); });
}
if (TimeToWriteDetailStat(t))
int usersCnt = 0;
// ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run
- std::list<USER_IMPL>::iterator usr = users.begin();
+ std::list<UserImpl>::iterator usr = users.begin();
while (usr != users.end())
{
usersCnt++;
usr->WriteDetailStat();
++usr;
if (usersCnt % 10 == 0)
- for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run));
+ for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });
}
}
RealDelUser();
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::NewDay(const struct tm & t)
+void UsersImpl::NewDay(const struct tm & t)
{
struct tm t1;
time_t tt = stgTime;
if (settings->GetSpreadFee())
{
printfd(__FILE__, "Spread DayFee\n");
- for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDayFeeSpread));
+ for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFeeSpread(); });
}
else
{
if (t.tm_mday == dayFee)
{
printfd(__FILE__, "DayFee\n");
- for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDayFee));
+ for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFee(); });
}
}
+std::for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDailyFee(); });
+std::for_each(users.begin(), users.end(), [](auto& user){ user.ProcessServices(); });
+
if (settings->GetDayFeeIsLastDay())
{
printfd(__FILE__, "DayResetTraff - 2 -\n");
}
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DayResetTraff(const struct tm & t1)
+void UsersImpl::DayResetTraff(const struct tm & t1)
{
int dayResetTraff = settings->GetDayResetTraff();
if (dayResetTraff == 0)
if (t1.tm_mday == dayResetTraff)
{
printfd(__FILE__, "ResetTraff\n");
- for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessNewMonth));
- //for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff));
+ for_each(users.begin(), users.end(), [](auto& user){ user.ProcessNewMonth(); });
+ //for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::SetPrepaidTraff));
}
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::Start()
+int UsersImpl::Start()
{
if (ReadUsers())
{
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::Stop()
+int UsersImpl::Stop()
{
printfd(__FILE__, "USERS::Stop()\n");
}
printfd(__FILE__, "Before USERS::Run()\n");
-for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run));
+for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });
// 'cause bind2st accepts only constant first param
-for (std::list<USER_IMPL>::iterator it = users.begin();
+for (std::list<UserImpl>::iterator it = users.begin();
it != users.end();
++it)
it->WriteDetailStat(true);
-for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::WriteStat));
-//for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteConf));
+for_each(users.begin(), users.end(), [](auto& user){ user.WriteStat(); });
+//for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::WriteConf));
printfd(__FILE__, "USERS::Stop()\n");
return 0;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::RealDelUser()
+void UsersImpl::RealDelUser()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
return;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddToIPIdx(user_iter user)
+void UsersImpl::AddToIPIdx(user_iter user)
{
printfd(__FILE__, "USERS: Add IP Idx\n");
uint32_t ip = user->GetCurrIP();
if (!ip)
return; // User has disconnected
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
const std::map<uint32_t, user_iter>::iterator it(
ipIndex.lower_bound(ip)
ipIndex.insert(it, std::make_pair(ip, user));
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelFromIPIdx(uint32_t ip)
+void UsersImpl::DelFromIPIdx(uint32_t ip)
{
printfd(__FILE__, "USERS: Del IP Idx\n");
assert(ip && "User has non-null ip");
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
const std::map<uint32_t, user_iter>::iterator it(
ipIndex.find(ip)
ipIndex.erase(it);
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const
+bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const
{
std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
if (it == ipIndex.end())
return true;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * usr) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
user_iter iter;
if (FindByIPIdx(ip, iter))
return -1;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** usr) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
user_iter iter;
if (FindByIPIdx(ip, iter))
return -1;
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
+bool UsersImpl::IsIPInIndex(uint32_t ip) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
return it != ipIndex.end();
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const
+bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-std::list<USER_IMPL>::const_iterator iter;
+STG_LOCKER lock(&mutex);
+std::list<UserImpl>::const_iterator iter;
iter = users.begin();
while (iter != users.end())
{
if (iter->GetLogin() != login &&
- !iter->GetProperty().ips.Get().IsAnyIP() &&
- iter->GetProperty().ips.Get().IsIPInIPS(ip))
+ !iter->GetProperties().ips.Get().isAnyIP() &&
+ iter->GetProperties().ips.Get().find(ip))
{
if (user != NULL)
*user = &(*iter);
return false;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::AddNotifierUserAdd(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::DelNotifierUserAdd(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiers.erase(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::AddNotifierUserDel(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::DelNotifierUserDel(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiers.erase(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::AddNotifierUserAdd(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiersImpl.insert(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::DelNotifierUserAdd(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onAddNotifiersImpl.erase(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::AddNotifierUserDel(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiersImpl.insert(n);
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::DelNotifierUserDel(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
onDelNotifiersImpl.erase(n);
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::OpenSearch()
+int UsersImpl::OpenSearch()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
handle++;
searchDescriptors[handle] = users.begin();
return handle;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::SearchNext(int h, USER_PTR * user)
+int UsersImpl::SearchNext(int h, UserPtr * user)
{
- USER_IMPL * ptr = NULL;
+ UserImpl * ptr = NULL;
if (SearchNext(h, &ptr))
return -1;
*user = ptr;
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::SearchNext(int h, USER_IMPL ** user)
+int UsersImpl::SearchNext(int h, UserImpl ** user)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (searchDescriptors.find(h) == searchDescriptors.end())
{
return 0;
}
//-----------------------------------------------------------------------------
-int USERS_IMPL::CloseSearch(int h)
+int UsersImpl::CloseSearch(int h)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (searchDescriptors.find(h) != searchDescriptors.end())
{
searchDescriptors.erase(searchDescriptors.find(h));
return -1;
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::AddUserIntoIndexes(user_iter user)
+void UsersImpl::AddUserIntoIndexes(user_iter user)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
loginIndex.insert(make_pair(user->GetLogin(), user));
}
//-----------------------------------------------------------------------------
-void USERS_IMPL::DelUserFromIndexes(user_iter user)
+void UsersImpl::DelUserFromIndexes(user_iter user)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
loginIndex.erase(user->GetLogin());
}
//-----------------------------------------------------------------------------
-bool USERS_IMPL::TimeToWriteDetailStat(const struct tm & t)
+bool UsersImpl::TimeToWriteDetailStat(const struct tm & t)
{
int statTime = settings->GetDetailStatWritePeriod();
git.stg.codes / stg.git / blobdiff