Commit 618b749e authored by Pavel Vainerman's avatar Pavel Vainerman
parent 9eb8bb0e
...@@ -322,6 +322,7 @@ class UniversalInterface ...@@ -322,6 +322,7 @@ class UniversalInterface
bool clean(); /*!< - */ bool clean(); /*!< - */
inline void clear() /*!< */ inline void clear() /*!< */
{ {
UniSetTypes::uniset_mutex_lock l(cmutex,200);
mcache.clear(); mcache.clear();
}; };
...@@ -352,6 +353,7 @@ class UniversalInterface ...@@ -352,6 +353,7 @@ class UniversalInterface
typedef std::map<int, Info> CacheMap; typedef std::map<int, Info> CacheMap;
CacheMap mcache; CacheMap mcache;
UniSetTypes::uniset_mutex cmutex;
unsigned int MaxSize; /*!< */ unsigned int MaxSize; /*!< */
unsigned int CleanTime; /*!< [] */ unsigned int CleanTime; /*!< [] */
......
...@@ -2264,6 +2264,7 @@ IOController_i::ShortIOInfo UniversalInterface::getChangedTime( UniSetTypes::Obj ...@@ -2264,6 +2264,7 @@ IOController_i::ShortIOInfo UniversalInterface::getChangedTime( UniSetTypes::Obj
ObjectPtr UniversalInterface::CacheOfResolve::resolve( ObjectId id, ObjectId node ) ObjectPtr UniversalInterface::CacheOfResolve::resolve( ObjectId id, ObjectId node )
throw(NameNotFound) throw(NameNotFound)
{ {
UniSetTypes::uniset_mutex_lock l(cmutex,200);
//#warning ޣ //#warning ޣ
// throw NameNotFound(); // throw NameNotFound();
...@@ -2289,6 +2290,7 @@ ObjectPtr UniversalInterface::CacheOfResolve::resolve( ObjectId id, ObjectId nod ...@@ -2289,6 +2290,7 @@ ObjectPtr UniversalInterface::CacheOfResolve::resolve( ObjectId id, ObjectId nod
// ------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------
void UniversalInterface::CacheOfResolve::cache( ObjectId id, ObjectId node, ObjectVar ptr ) void UniversalInterface::CacheOfResolve::cache( ObjectId id, ObjectId node, ObjectVar ptr )
{ {
UniSetTypes::uniset_mutex_lock l(cmutex,220);
//#warning ޣ //#warning ޣ
// return; // return;
...@@ -2312,6 +2314,7 @@ void UniversalInterface::CacheOfResolve::cache( ObjectId id, ObjectId node, Obje ...@@ -2312,6 +2314,7 @@ void UniversalInterface::CacheOfResolve::cache( ObjectId id, ObjectId node, Obje
// ------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------
bool UniversalInterface::CacheOfResolve::clean() bool UniversalInterface::CacheOfResolve::clean()
{ {
UniSetTypes::uniset_mutex_lock l(cmutex,180);
// return true; // return true;
if( unideb.debugging(Debug::INFO) ) if( unideb.debugging(Debug::INFO) )
...@@ -2336,6 +2339,7 @@ bool UniversalInterface::CacheOfResolve::clean() ...@@ -2336,6 +2339,7 @@ bool UniversalInterface::CacheOfResolve::clean()
void UniversalInterface::CacheOfResolve::erase( UniSetTypes::ObjectId id, UniSetTypes::ObjectId node ) void UniversalInterface::CacheOfResolve::erase( UniSetTypes::ObjectId id, UniSetTypes::ObjectId node )
{ {
UniSetTypes::uniset_mutex_lock l(cmutex,220);
//#warning ޣ //#warning ޣ
// return; // return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment