Clone from local repo.

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 398c457914894ea083d8f31e3cde6756985f569d..20ca6fd8052fe33336a3c66b89292a6da0462239 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -33,6 +33,8 @@ public:
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------

+typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY;
+//-----------------------------------------------------------------------------

 template<typename varT>
 class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:
 template<typename varT>
 class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:


@@ -75,10 +77,11 @@ public:
                          bool isStat,
                          STG_LOGGER & logger,
                          const std::string & sd,
                          bool isStat,
                          STG_LOGGER & logger,
                          const std::string & sd,

-                         std::map<std::string, USER_PROPERTY_BASE*> & properties);
+                         REGISTRY & properties);

     virtual ~USER_PROPERTY_LOGGED() {}
 
     USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; }
     virtual ~USER_PROPERTY_LOGGED() {}
 
     USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; }

+    const USER_PROPERTY_LOGGED<varT> * GetPointer() const throw() { return this; }

     const varT & Get() const { return USER_PROPERTY<varT>::ConstData(); }
     const std::string & GetName() const { return name; }
     bool Set(const varT & val,
     const varT & Get() const { return USER_PROPERTY<varT>::ConstData(); }
     const std::string & GetName() const { return name; }
     bool Set(const varT & val,


@@ -125,7 +128,7 @@ private:
     USER_STAT stat;
     USER_CONF conf;
 
     USER_STAT stat;
     USER_CONF conf;
 

-    std::map<std::string, USER_PROPERTY_BASE *> properties;
+    REGISTRY properties;

 public:
     USER_PROPERTIES(const std::string & sd);
 
 public:
     USER_PROPERTIES(const std::string & sd);
 


@@ -212,7 +215,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::Set(const varT & rvalue)
 {
 inline
 void USER_PROPERTY<varT>::Set(const varT & rvalue)
 {

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

 
 typename std::set<PROPERTY_NOTIFIER_BASE<varT> *>::iterator ni;
 
 
 typename std::set<PROPERTY_NOTIFIER_BASE<varT> *>::iterator ni;
 


@@ -242,7 +245,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::AddBeforeNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {

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

 beforeNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 beforeNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------


@@ -250,7 +253,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::DelBeforeNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {

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

 beforeNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------
 beforeNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------


@@ -258,7 +261,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::AddAfterNotifier(PROPERTY_NOTIFIER_BASE<varT> * n)
 {

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

 afterNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 afterNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------


@@ -266,7 +269,7 @@ template <typename varT>
 inline
 void USER_PROPERTY<varT>::DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {
 inline
 void USER_PROPERTY<varT>::DelAfterNotifier(const PROPERTY_NOTIFIER_BASE<varT> * n)
 {

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

 afterNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------
 afterNotifiers.erase(const_cast<PROPERTY_NOTIFIER_BASE<varT> *>(n));
 }
 //-----------------------------------------------------------------------------


@@ -280,7 +283,7 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
                                                  bool isSt,
                                                  STG_LOGGER & logger,
                                                  const std::string & sd,
                                                  bool isSt,
                                                  STG_LOGGER & logger,
                                                  const std::string & sd,

-                                                 std::map<std::string, USER_PROPERTY_BASE*> & properties)
+                                                 REGISTRY & properties)

 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),
 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),


@@ -392,7 +395,7 @@ else
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {

-std::map<std::string, USER_PROPERTY_BASE*>::const_iterator it = properties.find(name);
+REGISTRY::const_iterator it = properties.find(ToLower(name));

 if (it == properties.end())
     return "";
 return it->second->ToString();
 if (it == properties.end())
     return "";
 return it->second->ToString();


@@ -401,7 +404,7 @@ return it->second->ToString();
 inline
 bool USER_PROPERTIES::Exists(const std::string & name) const
 {
 inline
 bool USER_PROPERTIES::Exists(const std::string & name) const
 {

-return properties.find(name) != properties.end();
+return properties.find(ToLower(name)) != properties.end();

 }
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 }
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------