Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
618b749e
Commit
618b749e
authored
Dec 18, 2009
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug again
http://bugs.etersoft.ru/show_bug.cgi?id=4476
parent
9eb8bb0e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
UniversalInterface.h
include/UniversalInterface.h
+2
-0
UniversalInterface.cc
src/Interfaces/UniversalInterface.cc
+4
-0
No files found.
include/UniversalInterface.h
View file @
618b749e
...
@@ -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
;
/*!< [] */
...
...
src/Interfaces/UniversalInterface.cc
View file @
618b749e
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment