#pragma once
-#include <pthread.h>
+#include "settings_impl.h"
+#include "user_impl.h"
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/noncopyable.h"
#include <string>
#include <map>
#include <list>
#include <set>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
#include <ctime>
#include <cstdint>
-#include "stg/store.h"
-#include "stg/users.h"
-#include "stg/user.h"
-#include "stg/tariffs.h"
-#include "stg/logger.h"
-#include "stg/notifer.h"
-#include "stg/noncopyable.h"
-#include "actions.h"
-#include "eventloop.h"
-#include "settings_impl.h"
-#include "user_impl.h"
-
namespace STG
{
typedef std::list<UserImpl>::iterator user_iter;
typedef std::list<UserImpl>::const_iterator const_user_iter;
-class UsersImpl;
//-----------------------------------------------------------------------------
struct USER_TO_DEL {
USER_TO_DEL()
time_t delTime;
};
//-----------------------------------------------------------------------------
-class UsersImpl : public Users {
- friend class PROPERTY_NOTIFER_IP_BEFORE;
- friend class PROPERTY_NOTIFER_IP_AFTER;
-
-public:
- using UserImplPtr = UserImpl*;
-
- UsersImpl(SettingsImpl * s, Store * store,
- Tariffs * tariffs, Services & svcs,
- const Admin& sysAdmin);
- virtual ~UsersImpl();
-
- int FindByName(const std::string & login, UserPtr * user) override;
- int FindByName(const std::string & login, ConstUserPtr * user) const override;
- bool Exists(const std::string & login) const override;
-
- bool TariffInUse(const std::string & tariffName) const override;
+class UsersImpl : public Users
+{
+ public:
+ using UserImplPtr = UserImpl*;
- void AddNotifierUserAdd(NotifierBase<UserPtr> *) override;
- void DelNotifierUserAdd(NotifierBase<UserPtr> *) override;
+ UsersImpl(SettingsImpl * s, Store * store,
+ Tariffs * tariffs, Services & svcs,
+ const Admin& sysAdmin);
- void AddNotifierUserDel(NotifierBase<UserPtr> *) override;
- void DelNotifierUserDel(NotifierBase<UserPtr> *) override;
+ int FindByName(const std::string & login, UserPtr * user) override;
+ int FindByName(const std::string & login, ConstUserPtr * user) const override;
+ bool Exists(const std::string & login) const override;
- void AddNotifierUserAdd(NotifierBase<UserImplPtr> *);
- void DelNotifierUserAdd(NotifierBase<UserImplPtr> *);
+ bool TariffInUse(const std::string & tariffName) const override;
- void AddNotifierUserDel(NotifierBase<UserImplPtr> *);
- void DelNotifierUserDel(NotifierBase<UserImplPtr> *);
+ template <typename F>
+ auto onImplAdd(F&& f) { return m_onAddImplCallbacks.add(std::forward<F>(f)); }
+ template <typename F>
+ auto onImplDel(F&& f) { return m_onDelImplCallbacks.add(std::forward<F>(f)); }
- int Add(const std::string & login, const Admin * admin) override;
- void Del(const std::string & login, const Admin * admin) override;
+ int Add(const std::string & login, const Admin * admin) override;
+ void Del(const std::string & login, const Admin * admin) override;
- bool Authorize(const std::string & login, uint32_t ip,
- uint32_t enabledDirs, const Auth * auth) override;
- bool Unauthorize(const std::string & login,
- const Auth * auth,
- const std::string & reason) override;
+ bool Authorize(const std::string & login, uint32_t ip,
+ uint32_t enabledDirs, const Auth * auth) override;
+ bool Unauthorize(const std::string & login,
+ const Auth * auth,
+ const std::string & reason) override;
- int ReadUsers() override;
- size_t Count() const override { return users.size(); }
+ int ReadUsers() override;
+ size_t Count() const override { return users.size(); }
- int FindByIPIdx(uint32_t ip, UserPtr * user) const override;
- int FindByIPIdx(uint32_t ip, UserImpl ** user) const;
- bool IsIPInIndex(uint32_t ip) const override;
- bool IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const override;
+ int FindByIPIdx(uint32_t ip, UserPtr * user) const override;
+ int FindByIPIdx(uint32_t ip, UserImpl ** user) const;
+ bool IsIPInIndex(uint32_t ip) const override;
+ bool IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const override;
- int OpenSearch() override;
- int SearchNext(int handler, UserPtr * user) override;
- int SearchNext(int handler, UserImpl ** user);
- int CloseSearch(int handler) override;
+ unsigned int OpenSearch() override;
+ int SearchNext(int handler, UserPtr * user) override;
+ int SearchNext(int handler, UserImpl ** user);
+ int CloseSearch(int handler) override;
- int Start() override;
- int Stop() override;
+ int Start() override;
+ int Stop() override;
-private:
- UsersImpl(const UsersImpl & rvalue);
- UsersImpl & operator=(const UsersImpl & rvalue);
+ private:
+ UsersImpl(const UsersImpl & rvalue);
+ UsersImpl & operator=(const UsersImpl & rvalue);
- void AddToIPIdx(user_iter user);
- void DelFromIPIdx(uint32_t ip);
- bool FindByIPIdx(uint32_t ip, user_iter & iter) const;
+ void AddToIPIdx(user_iter user);
+ void DelFromIPIdx(uint32_t ip);
+ bool FindByIPIdx(uint32_t ip, user_iter & iter) const;
- int FindByNameNonLock(const std::string & login, user_iter * user);
- int FindByNameNonLock(const std::string & login, const_user_iter * user) const;
+ bool FindByNameNonLock(const std::string & login, user_iter * user);
+ bool FindByNameNonLock(const std::string & login, const_user_iter * user) const;
- void RealDelUser();
- void ProcessActions();
+ void RealDelUser();
+ void ProcessActions();
- void AddUserIntoIndexes(user_iter user);
- void DelUserFromIndexes(user_iter user);
+ void AddUserIntoIndexes(user_iter user);
+ void DelUserFromIndexes(user_iter user);
- static void * Run(void *);
- void NewMinute(const struct tm & t);
- void NewDay(const struct tm & t);
- void DayResetTraff(const struct tm & t);
+ void Run(std::stop_token token);
+ void NewMinute(const struct tm & t);
+ void NewDay(const struct tm & t);
+ void DayResetTraff(const struct tm & t);
- bool TimeToWriteDetailStat(const struct tm & t);
+ bool TimeToWriteDetailStat(const struct tm & t);
- std::list<UserImpl> users;
- std::list<USER_TO_DEL> usersToDelete;
+ std::list<UserImpl> users;
+ std::list<USER_TO_DEL> usersToDelete;
- std::map<uint32_t, user_iter> ipIndex;
- std::map<std::string, user_iter> loginIndex;
+ std::map<uint32_t, user_iter> ipIndex;
+ std::map<std::string, user_iter> loginIndex;
- SettingsImpl * settings;
- Tariffs * tariffs;
- Services & m_services;
- Store * store;
- const Admin& sysAdmin;
- Logger & WriteServLog;
+ SettingsImpl * settings;
+ Tariffs * m_tariffs;
+ Services & m_services;
+ Store * m_store;
+ const Admin& m_sysAdmin;
+ Logger & WriteServLog;
- bool nonstop;
- bool isRunning;
+ bool isRunning;
- mutable pthread_mutex_t mutex;
- pthread_t thread;
- mutable unsigned int handle;
+ mutable std::mutex m_mutex;
+ std::jthread m_thread;
+ mutable unsigned int handle;
- mutable std::map<int, user_iter> searchDescriptors;
+ mutable std::map<unsigned int, user_iter> searchDescriptors;
- std::set<NotifierBase<UserPtr>*> onAddNotifiers;
- std::set<NotifierBase<UserPtr>*> onDelNotifiers;
- std::set<NotifierBase<UserImplPtr>*> onAddNotifiersImpl;
- std::set<NotifierBase<UserImplPtr>*> onDelNotifiersImpl;
+ Subscriptions<UserImplPtr> m_onAddImplCallbacks;
+ Subscriptions<UserImplPtr> m_onDelImplCallbacks;
};
}
git.stg.codes / stg.git / blobdiff