Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
dbe880af
Commit
dbe880af
authored
Mar 03, 2015
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not iterate namespace while changing it
parent
08c85d65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
16 deletions
+24
-16
libcaf_core/caf/actor_namespace.hpp
libcaf_core/caf/actor_namespace.hpp
+5
-12
libcaf_core/src/actor_namespace.cpp
libcaf_core/src/actor_namespace.cpp
+14
-1
libcaf_io/src/basp_broker.cpp
libcaf_io/src/basp_broker.cpp
+5
-3
No files found.
libcaf_core/caf/actor_namespace.hpp
View file @
dbe880af
...
@@ -78,6 +78,11 @@ class actor_namespace {
...
@@ -78,6 +78,11 @@ class actor_namespace {
*/
*/
size_t
count_proxies
(
const
key_type
&
node
);
size_t
count_proxies
(
const
key_type
&
node
);
/**
* Returns all proxies for `node`.
*/
std
::
vector
<
actor_proxy_ptr
>
get_all
();
/**
/**
* Returns all proxies for `node`.
* Returns all proxies for `node`.
*/
*/
...
@@ -115,18 +120,6 @@ class actor_namespace {
...
@@ -115,18 +120,6 @@ class actor_namespace {
*/
*/
void
clear
();
void
clear
();
template
<
class
F
>
void
for_each
(
F
fun
)
{
for
(
auto
&
outer
:
m_proxies
)
{
for
(
auto
&
inner
:
outer
.
second
)
{
auto
ptr
=
inner
.
second
->
get
();
if
(
ptr
)
{
fun
(
ptr
);
}
}
}
}
private:
private:
backend
&
m_backend
;
backend
&
m_backend
;
std
::
map
<
key_type
,
proxy_map
>
m_proxies
;
std
::
map
<
key_type
,
proxy_map
>
m_proxies
;
...
...
libcaf_core/src/actor_namespace.cpp
View file @
dbe880af
...
@@ -87,13 +87,26 @@ size_t actor_namespace::count_proxies(const key_type& node) {
...
@@ -87,13 +87,26 @@ size_t actor_namespace::count_proxies(const key_type& node) {
return
(
i
!=
m_proxies
.
end
())
?
i
->
second
.
size
()
:
0
;
return
(
i
!=
m_proxies
.
end
())
?
i
->
second
.
size
()
:
0
;
}
}
std
::
vector
<
actor_proxy_ptr
>
actor_namespace
::
get_all
()
{
std
::
vector
<
actor_proxy_ptr
>
result
;
for
(
auto
&
outer
:
m_proxies
)
{
for
(
auto
&
inner
:
outer
.
second
)
{
auto
ptr
=
inner
.
second
->
get
();
if
(
ptr
)
{
result
.
push_back
(
std
::
move
(
ptr
));
}
}
}
return
result
;
}
std
::
vector
<
actor_proxy_ptr
>
actor_namespace
::
get_all
(
const
key_type
&
node
)
{
std
::
vector
<
actor_proxy_ptr
>
actor_namespace
::
get_all
(
const
key_type
&
node
)
{
std
::
vector
<
actor_proxy_ptr
>
result
;
std
::
vector
<
actor_proxy_ptr
>
result
;
auto
&
submap
=
m_proxies
[
node
];
auto
&
submap
=
m_proxies
[
node
];
for
(
auto
&
kvp
:
submap
)
{
for
(
auto
&
kvp
:
submap
)
{
auto
ptr
=
kvp
.
second
->
get
();
auto
ptr
=
kvp
.
second
->
get
();
if
(
ptr
)
{
if
(
ptr
)
{
result
.
push_back
(
ptr
);
result
.
push_back
(
std
::
move
(
ptr
)
);
}
}
}
}
return
result
;
return
result
;
...
...
libcaf_io/src/basp_broker.cpp
View file @
dbe880af
...
@@ -696,9 +696,11 @@ actor_proxy_ptr basp_broker::make_proxy(const node_id& nid, actor_id aid) {
...
@@ -696,9 +696,11 @@ actor_proxy_ptr basp_broker::make_proxy(const node_id& nid, actor_id aid) {
void
basp_broker
::
on_exit
()
{
void
basp_broker
::
on_exit
()
{
CAF_LOG_TRACE
(
""
);
CAF_LOG_TRACE
(
""
);
// kill all remaining proxies
// kill all remaining proxies
m_namespace
.
for_each
([](
const
actor_proxy_ptr
&
ptr
)
{
auto
proxies
=
m_namespace
.
get_all
();
ptr
->
kill_proxy
(
exit_reason
::
remote_link_unreachable
);
for
(
auto
&
proxy
:
proxies
)
{
});
CAF_REQUIRE
(
proxy
!=
nullptr
);
proxy
->
kill_proxy
(
exit_reason
::
remote_link_unreachable
);
}
m_namespace
.
clear
();
m_namespace
.
clear
();
// remove all remaining state
// remove all remaining state
m_ctx
.
clear
();
m_ctx
.
clear
();
...
...
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