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
d5061b01
Commit
d5061b01
authored
Sep 28, 2015
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix detaching process in network::manager
parent
1608c0b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
libcaf_io/caf/io/broker_servant.hpp
libcaf_io/caf/io/broker_servant.hpp
+1
-3
libcaf_io/caf/io/network/manager.hpp
libcaf_io/caf/io/network/manager.hpp
+2
-2
libcaf_io/src/manager.cpp
libcaf_io/src/manager.cpp
+6
-4
No files found.
libcaf_io/caf/io/broker_servant.hpp
View file @
d5061b01
...
@@ -42,9 +42,7 @@ public:
...
@@ -42,9 +42,7 @@ public:
}
}
protected:
protected:
void
detach_from_parent
()
override
{
void
detach_from
(
abstract_broker
*
ptr
)
override
{
auto
ptr
=
this
->
parent
();
this
->
set_parent
(
nullptr
);
ptr
->
erase
(
hdl_
);
ptr
->
erase
(
hdl_
);
}
}
...
...
libcaf_io/caf/io/network/manager.hpp
View file @
d5061b01
...
@@ -74,8 +74,8 @@ protected:
...
@@ -74,8 +74,8 @@ protected:
/// Creates a message signalizing a disconnect to the parent.
/// Creates a message signalizing a disconnect to the parent.
virtual
message
detach_message
()
=
0
;
virtual
message
detach_message
()
=
0
;
/// Detaches this manager from
its parent
.
/// Detaches this manager from
`ptr`
.
virtual
void
detach_from
_parent
(
)
=
0
;
virtual
void
detach_from
(
abstract_broker
*
ptr
)
=
0
;
private:
private:
abstract_broker
*
parent_
;
abstract_broker
*
parent_
;
...
...
libcaf_io/src/manager.cpp
View file @
d5061b01
...
@@ -44,12 +44,14 @@ void manager::detach(bool invoke_disconnect_message) {
...
@@ -44,12 +44,14 @@ void manager::detach(bool invoke_disconnect_message) {
CAF_LOG_TRACE
(
""
);
CAF_LOG_TRACE
(
""
);
if
(
!
detached
())
{
if
(
!
detached
())
{
CAF_LOG_DEBUG
(
"disconnect servant from broker"
);
CAF_LOG_DEBUG
(
"disconnect servant from broker"
);
auto
ptr
=
parent
();
set_parent
(
nullptr
);
detach_from
(
ptr
);
if
(
invoke_disconnect_message
)
{
if
(
invoke_disconnect_message
)
{
auto
ptr
=
mailbox_element
::
make
(
invalid_actor_addr
,
invalid_message_id
,
auto
m
ptr
=
mailbox_element
::
make
(
invalid_actor_addr
,
invalid_message_id
,
detach_message
());
detach_message
());
p
arent_
->
exec_single_event
(
ptr
);
p
tr
->
exec_single_event
(
m
ptr
);
}
}
detach_from_parent
();
}
}
}
}
...
...
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