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
6293a3c4
Commit
6293a3c4
authored
Mar 17, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add stream aborters when adding new paths
parent
2cc85236
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
34 deletions
+45
-34
libcaf_core/caf/inbound_path.hpp
libcaf_core/caf/inbound_path.hpp
+0
-3
libcaf_core/caf/stream_aborter.hpp
libcaf_core/caf/stream_aborter.hpp
+6
-6
libcaf_core/src/inbound_path.cpp
libcaf_core/src/inbound_path.cpp
+5
-0
libcaf_core/src/outbound_path.cpp
libcaf_core/src/outbound_path.cpp
+4
-1
libcaf_core/src/scheduled_actor.cpp
libcaf_core/src/scheduled_actor.cpp
+5
-1
libcaf_core/src/stream_aborter.cpp
libcaf_core/src/stream_aborter.cpp
+25
-23
No files found.
libcaf_core/caf/inbound_path.hpp
View file @
6293a3c4
...
...
@@ -38,9 +38,6 @@ namespace caf {
/// State for a path to an upstream actor (source).
class
inbound_path
{
public:
/// Stream aborter flag to monitor a path.
static
constexpr
const
auto
aborter_type
=
stream_aborter
::
source_aborter
;
/// Message type for propagating graceful shutdowns.
using
regular_shutdown
=
upstream_msg
::
drop
;
...
...
libcaf_core/caf/stream_aborter.hpp
View file @
6293a3c4
...
...
@@ -35,13 +35,13 @@ public:
struct
token
{
const
actor_addr
&
observer
;
stream_slot
s
slots
;
stream_slot
slot
;
mode
m
;
static
constexpr
size_t
token_type
=
attachable
::
token
::
stream_aborter
;
};
stream_aborter
(
actor_addr
&&
observed
,
actor_addr
&&
observer
,
stream_slot
s
slots
,
mode
m
);
stream_slot
slot
,
mode
m
);
~
stream_aborter
()
override
;
...
...
@@ -51,21 +51,21 @@ public:
/// Adds a stream aborter to `observed`.
static
void
add
(
strong_actor_ptr
observed
,
actor_addr
observer
,
stream_slot
s
slots
,
mode
m
);
stream_slot
slot
,
mode
m
);
/// Removes a stream aborter from `observed`.
static
void
del
(
strong_actor_ptr
observed
,
const
actor_addr
&
observer
,
stream_slot
s
slots
,
mode
m
);
stream_slot
slot
,
mode
m
);
private:
actor_addr
observed_
;
actor_addr
observer_
;
stream_slot
s
slots
_
;
stream_slot
slot
_
;
mode
mode_
;
};
attachable_ptr
make_stream_aborter
(
actor_addr
observed
,
actor_addr
observer
,
stream_slot
s
slot
,
stream_aborter
::
mode
m
);
stream_slot
slot
,
stream_aborter
::
mode
m
);
}
// namespace caf
...
...
libcaf_core/src/inbound_path.cpp
View file @
6293a3c4
...
...
@@ -89,7 +89,12 @@ void inbound_path::handle(downstream_msg::batch& x) {
void
inbound_path
::
emit_ack_open
(
local_actor
*
self
,
actor_addr
rebind_from
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
slots
)
<<
CAF_ARG
(
rebind_from
));
// Update state.
assigned_credit
=
initial_credit
;
// Make sure we receive errors from this point on.
stream_aborter
::
add
(
hdl
,
self
->
address
(),
slots
.
receiver
,
stream_aborter
::
source_aborter
);
// Send message.
unsafe_send_as
(
self
,
hdl
,
make
<
upstream_msg
::
ack_open
>
(
slots
.
invert
(),
self
->
address
(),
std
::
move
(
rebind_from
),
...
...
libcaf_core/src/outbound_path.cpp
View file @
6293a3c4
...
...
@@ -47,7 +47,10 @@ void outbound_path::emit_open(local_actor* self, stream_slot slot,
<<
CAF_ARG
(
prio
));
CAF_ASSERT
(
self
!=
nullptr
);
CAF_ASSERT
(
to
!=
nullptr
);
// TODO: attach an aborter to `to`
// Make sure we receive errors from this point on.
stream_aborter
::
add
(
to
,
self
->
address
(),
slot
,
stream_aborter
::
sink_aborter
);
// Send message.
unsafe_send_as
(
self
,
to
,
open_stream_msg
{
slot
,
std
::
move
(
handshake_data
),
self
->
ctrl
(),
nullptr
,
prio
});
...
...
libcaf_core/src/scheduled_actor.cpp
View file @
6293a3c4
...
...
@@ -291,7 +291,11 @@ struct downstream_msg_visitor {
// Do *not* store a reference here since we potentially reset `inptr`.
auto
mgr
=
inptr
->
mgr
;
inptr
->
handle
(
x
);
CAF_ASSERT
(
inptr
->
slots
==
dm
.
slots
);
// The sender slot can be 0. This is the case for forced_close or
// forced_drop messages from stream aborters.
CAF_ASSERT
(
inptr
->
slots
==
dm
.
slots
||
(
dm
.
slots
.
sender
==
0
&&
dm
.
slots
.
receiver
==
inptr
->
slots
.
receiver
));
// TODO: replace with `if constexpr` when switching to C++17
if
(
std
::
is_same
<
T
,
downstream_msg
::
close
>::
value
||
std
::
is_same
<
T
,
downstream_msg
::
forced_close
>::
value
)
{
...
...
libcaf_core/src/stream_aborter.cpp
View file @
6293a3c4
...
...
@@ -23,6 +23,7 @@
#include "caf/downstream_msg.hpp"
#include "caf/logger.hpp"
#include "caf/message.hpp"
#include "caf/no_stages.hpp"
#include "caf/system_messages.hpp"
#include "caf/upstream_msg.hpp"
...
...
@@ -35,18 +36,19 @@ stream_aborter::~stream_aborter() {
void
stream_aborter
::
actor_exited
(
const
error
&
rsn
,
execution_unit
*
host
)
{
CAF_ASSERT
(
observed_
!=
observer_
);
auto
observer
=
actor_cast
<
strong_actor_ptr
>
(
observer_
);
if
(
observer
!=
nullptr
)
{
if
(
mode_
==
source_aborter
)
observer
->
enqueue
(
nullptr
,
make_message_id
(),
make_message
(
caf
::
make
<
downstream_msg
::
forced_close
>
(
slots_
,
observed_
,
rsn
)),
host
);
else
observer
->
enqueue
(
nullptr
,
make_message_id
(),
make_message
(
caf
::
make
<
upstream_msg
::
forced_drop
>
(
slots_
,
observed_
,
rsn
)),
host
);
if
(
observer
!=
nullptr
)
{
stream_slots
slots
{
0
,
slot_
};
mailbox_element_ptr
ptr
;
if
(
mode_
==
source_aborter
)
{
using
msg_type
=
downstream_msg
::
forced_close
;
ptr
=
make_mailbox_element
(
nullptr
,
make_message_id
(),
no_stages
,
caf
::
make
<
msg_type
>
(
slots
,
observed_
,
rsn
));
}
else
{
using
msg_type
=
upstream_msg
::
forced_drop
;
ptr
=
make_mailbox_element
(
nullptr
,
make_message_id
(),
no_stages
,
caf
::
make
<
msg_type
>
(
slots
,
observed_
,
rsn
));
}
observer
->
enqueue
(
std
::
move
(
ptr
),
host
);
}
}
...
...
@@ -54,37 +56,37 @@ bool stream_aborter::matches(const attachable::token& what) {
if
(
what
.
subtype
!=
attachable
::
token
::
stream_aborter
)
return
false
;
auto
&
ot
=
*
reinterpret_cast
<
const
token
*>
(
what
.
ptr
);
return
ot
.
observer
==
observer_
&&
ot
.
slot
s
==
slots
_
;
return
ot
.
observer
==
observer_
&&
ot
.
slot
==
slot
_
;
}
stream_aborter
::
stream_aborter
(
actor_addr
&&
observed
,
actor_addr
&&
observer
,
stream_slot
s
slots
,
mode
m
)
stream_slot
slot
,
mode
m
)
:
observed_
(
std
::
move
(
observed
)),
observer_
(
std
::
move
(
observer
)),
slot
s_
(
slots
),
slot
_
(
slot
),
mode_
(
m
)
{
// nop
}
void
stream_aborter
::
add
(
strong_actor_ptr
observed
,
actor_addr
observer
,
stream_slot
s
slots
,
mode
m
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
observed
)
<<
CAF_ARG
(
observer
)
<<
CAF_ARG
(
slot
s
));
stream_slot
slot
,
mode
m
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
observed
)
<<
CAF_ARG
(
observer
)
<<
CAF_ARG
(
slot
));
auto
ptr
=
make_stream_aborter
(
observed
->
address
(),
std
::
move
(
observer
),
slot
s
,
m
);
slot
,
m
);
observed
->
get
()
->
attach
(
std
::
move
(
ptr
));
}
void
stream_aborter
::
del
(
strong_actor_ptr
observed
,
const
actor_addr
&
observer
,
stream_slot
s
slots
,
mode
m
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
observed
)
<<
CAF_ARG
(
observer
)
<<
CAF_ARG
(
slot
s
));
token
tk
{
observer
,
slot
s
,
m
};
stream_slot
slot
,
mode
m
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
observed
)
<<
CAF_ARG
(
observer
)
<<
CAF_ARG
(
slot
));
token
tk
{
observer
,
slot
,
m
};
observed
->
get
()
->
detach
(
tk
);
}
attachable_ptr
make_stream_aborter
(
actor_addr
observed
,
actor_addr
observer
,
stream_slot
s
slots
,
stream_aborter
::
mode
m
)
{
stream_slot
slot
,
stream_aborter
::
mode
m
)
{
return
attachable_ptr
{
new
stream_aborter
(
std
::
move
(
observed
),
std
::
move
(
observer
),
slot
s
,
m
)};
new
stream_aborter
(
std
::
move
(
observed
),
std
::
move
(
observer
),
slot
,
m
)};
}
}
// namespace caf
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