Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ipc
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scott Snyder
ipc
Commits
8eac56bc
Commit
8eac56bc
authored
1 year ago
by
Serguei Kolos
Browse files
Options
Downloads
Patches
Plain Diff
Clean up objects cache when IPCCore::shutdown is called
parent
5c7f32da
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ipc/cache.h
+2
-1
2 additions, 1 deletion
ipc/cache.h
src/core.cc
+10
-2
10 additions, 2 deletions
src/core.cc
with
12 additions
and
3 deletions
ipc/cache.h
+
2
−
1
View file @
8eac56bc
...
...
@@ -17,6 +17,7 @@ template <class T> class IPCSingleton;
class
IPCCache
:
public
boost
::
noncopyable
{
template
<
class
>
friend
class
IPCSingleton
;
friend
class
IPCCore
;
typedef
boost
::
function
<
CORBA
::
Object_ptr
(
)
>
Resolver
;
...
...
@@ -68,7 +69,7 @@ class IPCCache : public boost::noncopyable
IPCCache
(
);
void
destroy
()
{
delete
this
;
}
CORBA
::
Boolean
handleException
(
IPCCache
::
Entity
*
entity
,
CORBA
::
ULong
retries
,
bool
is_timedout
);
static
CORBA
::
Boolean
global_transient_handler
(
void
*
cookie
,
CORBA
::
ULong
retries
,
const
CORBA
::
TRANSIENT
&
);
...
...
This diff is collapsed.
Click to expand it.
src/core.cc
+
10
−
2
View file @
8eac56bc
...
...
@@ -363,7 +363,15 @@ IPCCore::shutdown( )
{
throw
daq
::
ipc
::
NotInitialized
(
ERS_HERE
);
}
{
// TODO: this is a temporary solution to be compatible with the
// tdaq-10-00-00 release to produce a patch. To be fixed properly in the
// next release
boost
::
mutex
::
scoped_lock
lock
(
IPCSingleton
<
IPCCache
>::
instance
().
m_mutex
);
IPCSingleton
<
IPCCache
>::
instance
().
m_map
.
clear
();
}
try
{
// Sometimes deactivating Root POA causes hang up of the ORB shutdown
...
...
@@ -380,7 +388,7 @@ IPCCore::shutdown( )
{
throw
daq
::
ipc
::
CorbaSystemException
(
ERS_HERE
,
&
ex
);
}
ipc
::
destroy_interceptors
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment