From: Maxim Mamontov Date: Mon, 21 Mar 2011 13:58:07 +0000 (+0200) Subject: Unused methods removed, add some inlining X-Git-Tag: 2.407-rc3~132 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/44b34d43a7e7cdba4073fb71346f3bb396587071?ds=sidebyside Unused methods removed, add some inlining --- diff --git a/include/user_property.h b/include/user_property.h index b269389a..402f69fb 100644 --- a/include/user_property.h +++ b/include/user_property.h @@ -19,6 +19,7 @@ $Author: faust $ #include "stg_logger.h" #include "stg_locker.h" #include "script_executer.h" +#include "noncopyable.h" extern const volatile time_t stgTime; @@ -32,15 +33,11 @@ public: void Set(const varT & rvalue); USER_PROPERTY & operator= (const varT & rvalue); - USER_PROPERTY & operator-= (const varT & rvalue); - const varT * operator&() const throw(); - const varT & ConstData() const throw(); + const varT * operator&() const throw() { return &value; } + const varT & ConstData() const throw() { return value; } - operator const varT&() const throw() - { - return value; - } + operator const varT&() const throw() { return value; } void AddBeforeNotifier(PROPERTY_NOTIFIER_BASE * n); void DelBeforeNotifier(PROPERTY_NOTIFIER_BASE * n); @@ -48,7 +45,7 @@ public: void AddAfterNotifier(PROPERTY_NOTIFIER_BASE * n); void DelAfterNotifier(PROPERTY_NOTIFIER_BASE * n); - time_t ModificationTime() const throw(); + time_t ModificationTime() const throw() { return modificationTime; } void ModifyTime() throw(); private: @@ -68,11 +65,11 @@ public: bool isStat, STG_LOGGER & logger, const std::string & sd); - virtual ~USER_PROPERTY_LOGGED(); + virtual ~USER_PROPERTY_LOGGED() {} - USER_PROPERTY_LOGGED * GetPointer() throw(); - const varT & Get() const; - const std::string & GetName() const; + USER_PROPERTY_LOGGED * GetPointer() throw() { return this; } + const varT & Get() const { return USER_PROPERTY::ConstData(); } + const std::string & GetName() const { return name; } bool Set(const varT & val, const ADMIN * admin, const std::string & login, @@ -104,7 +101,7 @@ private: const std::string scriptsDir; }; //----------------------------------------------------------------------------- -class USER_PROPERTIES { +class USER_PROPERTIES : private NONCOPYABLE { /* В этом месте важен порядок следования приватной и открытой частей. Это связано с тем, что часть которая находится в публичной секции @@ -171,25 +168,30 @@ public: //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- template +inline USER_PROPERTY::USER_PROPERTY(varT & val) - : value(val) + : value(val), + modificationTime(stgTime) { pthread_mutex_init(&mutex, NULL); -modificationTime = stgTime; } //----------------------------------------------------------------------------- template +inline USER_PROPERTY::~USER_PROPERTY() { +pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- template +inline void USER_PROPERTY::ModifyTime() throw() { modificationTime = stgTime; } //----------------------------------------------------------------------------- template +inline void USER_PROPERTY::Set(const varT & rvalue) { STG_LOCKER locker(&mutex, __FILE__, __LINE__); @@ -211,6 +213,7 @@ while (ni != afterNotifiers.end()) } //----------------------------------------------------------------------------- template +inline USER_PROPERTY & USER_PROPERTY::operator= (const varT & newValue) { Set(newValue); @@ -218,26 +221,7 @@ return *this; } //----------------------------------------------------------------------------- template -USER_PROPERTY& USER_PROPERTY::operator-= (const varT & delta) -{ -varT newValue = ConstData() - delta; -Set(newValue); -return *this; -} -//----------------------------------------------------------------------------- -template -const varT * USER_PROPERTY::operator&() const throw() -{ -return &value; -} -//----------------------------------------------------------------------------- -template -const varT & USER_PROPERTY::ConstData() const throw() -{ -return value; -} -//----------------------------------------------------------------------------- -template +inline void USER_PROPERTY::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE * n) { STG_LOCKER locker(&mutex, __FILE__, __LINE__); @@ -245,6 +229,7 @@ beforeNotifiers.insert(n); } //----------------------------------------------------------------------------- template +inline void USER_PROPERTY::DelBeforeNotifier(PROPERTY_NOTIFIER_BASE * n) { STG_LOCKER locker(&mutex, __FILE__, __LINE__); @@ -252,6 +237,7 @@ beforeNotifiers.erase(n); } //----------------------------------------------------------------------------- template +inline void USER_PROPERTY::AddAfterNotifier(PROPERTY_NOTIFIER_BASE * n) { STG_LOCKER locker(&mutex, __FILE__, __LINE__); @@ -259,21 +245,17 @@ afterNotifiers.insert(n); } //----------------------------------------------------------------------------- template +inline void USER_PROPERTY::DelAfterNotifier(PROPERTY_NOTIFIER_BASE * n) { STG_LOCKER locker(&mutex, __FILE__, __LINE__); afterNotifiers.erase(n); } //----------------------------------------------------------------------------- -template -time_t USER_PROPERTY::ModificationTime() const throw() -{ -return modificationTime; -} -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- template +inline USER_PROPERTY_LOGGED::USER_PROPERTY_LOGGED(varT & val, std::string n, bool isPass, @@ -289,29 +271,6 @@ USER_PROPERTY_LOGGED::USER_PROPERTY_LOGGED(varT & val, scriptsDir(sd) { } -//----------------------------------------------------------------------------- -template -USER_PROPERTY_LOGGED::~USER_PROPERTY_LOGGED() -{ -} -//----------------------------------------------------------------------------- -template -USER_PROPERTY_LOGGED * USER_PROPERTY_LOGGED::GetPointer() throw() -{ -return this; -} -//----------------------------------------------------------------------------- -template -const varT & USER_PROPERTY_LOGGED::Get() const -{ -return USER_PROPERTY::ConstData(); -}; -//------------------------------------------------------------------------- -template -const std::string & USER_PROPERTY_LOGGED::GetName() const -{ -return name; -}; //------------------------------------------------------------------------- template bool USER_PROPERTY_LOGGED::Set(const varT & val, @@ -329,8 +288,8 @@ if ((priv->userConf && !isStat) || (priv->userPasswd && isPassword) || (priv->userCash && name == "cash")) { - stringstream oldVal; - stringstream newVal; + std::stringstream oldVal; + std::stringstream newVal; oldVal.flags(oldVal.flags() | ios::fixed); newVal.flags(newVal.flags() | ios::fixed); @@ -360,6 +319,7 @@ return true; } //------------------------------------------------------------------------- template +inline void USER_PROPERTY_LOGGED::WriteAccessDenied(const std::string & login, const ADMIN * admin, const std::string & parameter) @@ -369,6 +329,7 @@ stgLogger("%s Change user \'%s.\' Parameter \'%s\'. Access denied.", } //------------------------------------------------------------------------- template +inline void USER_PROPERTY_LOGGED::WriteSuccessChange(const std::string & login, const ADMIN * admin, const std::string & parameter, @@ -411,6 +372,7 @@ else //------------------------------------------------------------------------- //------------------------------------------------------------------------- template +inline ostream & operator<< (ostream & stream, const USER_PROPERTY & value) { return stream << value.ConstData();