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
e730ad4a
Commit
e730ad4a
authored
Mar 07, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consistently use (in|out)bound path terminology
parent
0a1da9b7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
26 deletions
+26
-26
libcaf_core/caf/scheduled_actor.hpp
libcaf_core/caf/scheduled_actor.hpp
+14
-14
libcaf_core/src/scheduled_actor.cpp
libcaf_core/src/scheduled_actor.cpp
+4
-4
libcaf_core/test/continuous_streaming.cpp
libcaf_core/test/continuous_streaming.cpp
+2
-2
libcaf_core/test/fused_streaming.cpp
libcaf_core/test/fused_streaming.cpp
+4
-4
libcaf_core/test/selective_streaming.cpp
libcaf_core/test/selective_streaming.cpp
+2
-2
No files found.
libcaf_core/caf/scheduled_actor.hpp
View file @
e730ad4a
...
@@ -416,7 +416,7 @@ public:
...
@@ -416,7 +416,7 @@ public:
/// Creates an output path for given source.
/// Creates an output path for given source.
template
<
class
Out
,
class
Scatterer
,
class
...
Ts
>
template
<
class
Out
,
class
Scatterer
,
class
...
Ts
>
make_source_result
<
Out
,
Scatterer
,
Ts
...
>
make_source_result
<
Out
,
Scatterer
,
Ts
...
>
add_out
put
_path
(
stream_source_ptr
<
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
add_out
bound
_path
(
stream_source_ptr
<
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
auto
slot
=
assign_next_pending_slot
(
mgr
);
auto
slot
=
assign_next_pending_slot
(
mgr
);
return
{
slot
,
std
::
move
(
mgr
)};
return
{
slot
,
std
::
move
(
mgr
)};
}
}
...
@@ -424,7 +424,7 @@ public:
...
@@ -424,7 +424,7 @@ public:
/// Creates an output path for given stage.
/// Creates an output path for given stage.
template
<
class
In
,
class
Result
,
class
Out
,
class
Scatterer
,
class
...
Ts
>
template
<
class
In
,
class
Result
,
class
Out
,
class
Scatterer
,
class
...
Ts
>
make_source_result
<
Out
,
Scatterer
,
Ts
...
>
make_source_result
<
Out
,
Scatterer
,
Ts
...
>
add_out
put
_path
(
stream_stage_ptr
<
In
,
Result
,
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
add_out
bound
_path
(
stream_stage_ptr
<
In
,
Result
,
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
auto
slot
=
assign_next_pending_slot
(
mgr
);
auto
slot
=
assign_next_pending_slot
(
mgr
);
return
{
slot
,
std
::
move
(
mgr
)};
return
{
slot
,
std
::
move
(
mgr
)};
}
}
...
@@ -432,7 +432,7 @@ public:
...
@@ -432,7 +432,7 @@ public:
/// Creates an output path for the given stage without any type checking.
/// Creates an output path for the given stage without any type checking.
/// @private
/// @private
template
<
class
Out
,
class
...
Ts
>
template
<
class
Out
,
class
...
Ts
>
output_stream
<
Out
,
Ts
...
>
add_unsafe_out
put
_path
(
stream_manager_ptr
mgr
)
{
output_stream
<
Out
,
Ts
...
>
add_unsafe_out
bound
_path
(
stream_manager_ptr
mgr
)
{
auto
slot
=
assign_next_pending_slot
(
mgr
);
auto
slot
=
assign_next_pending_slot
(
mgr
);
return
{
0
,
slot
,
std
::
move
(
mgr
)};
return
{
0
,
slot
,
std
::
move
(
mgr
)};
}
}
...
@@ -442,7 +442,7 @@ public:
...
@@ -442,7 +442,7 @@ public:
/// @pre `pending_stream_managers_[slot] == mgr`
/// @pre `pending_stream_managers_[slot] == mgr`
/// @pre `mgr->out().terminal() == false`
/// @pre `mgr->out().terminal() == false`
/// @private
/// @private
void
add_unsafe_out
put
_path
(
stream_manager_ptr
mgr
,
strong_actor_ptr
next
,
void
add_unsafe_out
bound
_path
(
stream_manager_ptr
mgr
,
strong_actor_ptr
next
,
stream_slot
slot
,
strong_actor_ptr
origin
,
stream_slot
slot
,
strong_actor_ptr
origin
,
mailbox_element
::
forwarding_stack
stages
,
mailbox_element
::
forwarding_stack
stages
,
message_id
mid
);
message_id
mid
);
...
@@ -450,7 +450,7 @@ public:
...
@@ -450,7 +450,7 @@ public:
/// Creates an input path for given stage.
/// Creates an input path for given stage.
template
<
class
In
,
class
Result
,
class
Out
,
class
Scatterer
,
class
...
Ts
>
template
<
class
In
,
class
Result
,
class
Out
,
class
Scatterer
,
class
...
Ts
>
make_sink_result
<
In
,
Result
>
make_sink_result
<
In
,
Result
>
add_in
put
_path
(
const
stream
<
In
>&
,
add_in
bound
_path
(
const
stream
<
In
>&
,
stream_stage_ptr
<
In
,
Result
,
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
stream_stage_ptr
<
In
,
Result
,
Out
,
Scatterer
,
Ts
...
>
mgr
)
{
auto
slot
=
assign_next_slot
(
mgr
);
auto
slot
=
assign_next_slot
(
mgr
);
return
{
slot
,
std
::
move
(
mgr
)};
return
{
slot
,
std
::
move
(
mgr
)};
...
@@ -459,7 +459,7 @@ public:
...
@@ -459,7 +459,7 @@ public:
/// Creates an input path for given stage.
/// Creates an input path for given stage.
/// @private
/// @private
template
<
class
Result
,
class
In
>
template
<
class
Result
,
class
In
>
stream_result
<
Result
>
add_unsafe_in
put
_path
(
const
stream
<
In
>&
,
stream_result
<
Result
>
add_unsafe_in
bound
_path
(
const
stream
<
In
>&
,
stream_manager_ptr
mgr
)
{
stream_manager_ptr
mgr
)
{
auto
slot
=
assign_next_slot
(
mgr
);
auto
slot
=
assign_next_slot
(
mgr
);
return
{
slot
,
std
::
move
(
mgr
)};
return
{
slot
,
std
::
move
(
mgr
)};
...
@@ -552,7 +552,7 @@ public:
...
@@ -552,7 +552,7 @@ public:
auto
result
=
make_source
(
std
::
move
(
xs
),
std
::
move
(
init
),
std
::
move
(
pull
),
auto
result
=
make_source
(
std
::
move
(
xs
),
std
::
move
(
init
),
std
::
move
(
pull
),
std
::
move
(
done
),
scatterer_arg
);
std
::
move
(
done
),
scatterer_arg
);
auto
mid
=
new_request_id
(
message_priority
::
normal
);
auto
mid
=
new_request_id
(
message_priority
::
normal
);
add_unsafe_out
put
_path
(
result
.
ptr
(),
actor_cast
<
strong_actor_ptr
>
(
dest
),
add_unsafe_out
bound
_path
(
result
.
ptr
(),
actor_cast
<
strong_actor_ptr
>
(
dest
),
result
.
out
(),
actor_cast
<
strong_actor_ptr
>
(
this
),
result
.
out
(),
actor_cast
<
strong_actor_ptr
>
(
this
),
no_stages
,
mid
);
no_stages
,
mid
);
behavior
tmp
{
behavior
tmp
{
...
...
libcaf_core/src/scheduled_actor.cpp
View file @
e730ad4a
...
@@ -402,7 +402,7 @@ void scheduled_actor::quit(error x) {
...
@@ -402,7 +402,7 @@ void scheduled_actor::quit(error x) {
// -- stream management --------------------------------------------------------
// -- stream management --------------------------------------------------------
void
scheduled_actor
::
add_unsafe_out
put
_path
(
void
scheduled_actor
::
add_unsafe_out
bound
_path
(
stream_manager_ptr
mgr
,
strong_actor_ptr
next
,
stream_slot
slot
,
stream_manager_ptr
mgr
,
strong_actor_ptr
next
,
stream_slot
slot
,
strong_actor_ptr
origin
,
mailbox_element
::
forwarding_stack
stages
,
strong_actor_ptr
origin
,
mailbox_element
::
forwarding_stack
stages
,
message_id
mid
)
{
message_id
mid
)
{
...
@@ -444,7 +444,7 @@ sec scheduled_actor::build_pipeline(stream_slot in, stream_slot out,
...
@@ -444,7 +444,7 @@ sec scheduled_actor::build_pipeline(stream_slot in, stream_slot out,
if
(
out
!=
0
&&
mgr
->
out
().
path
(
out
)
==
nullptr
)
{
if
(
out
!=
0
&&
mgr
->
out
().
path
(
out
)
==
nullptr
)
{
if
(
next
==
nullptr
)
if
(
next
==
nullptr
)
return
fail
(
sec
::
no_downstream_stages_defined
);
return
fail
(
sec
::
no_downstream_stages_defined
);
add_unsafe_out
put
_path
(
mgr
,
std
::
move
(
next
),
out
,
current_sender
(),
add_unsafe_out
bound
_path
(
mgr
,
std
::
move
(
next
),
out
,
current_sender
(),
take_current_forwarding_stack
(),
take_current_forwarding_stack
(),
current_message_id
());
current_message_id
());
}
}
...
...
libcaf_core/test/continuous_streaming.cpp
View file @
e730ad4a
...
@@ -127,11 +127,11 @@ TESTEE(stream_multiplexer) {
...
@@ -127,11 +127,11 @@ TESTEE(stream_multiplexer) {
return
{
return
{
[
=
](
join_atom
)
{
[
=
](
join_atom
)
{
CAF_MESSAGE
(
"received 'join' request"
);
CAF_MESSAGE
(
"received 'join' request"
);
return
self
->
add_out
put
_path
(
self
->
state
.
stage
);
return
self
->
add_out
bound
_path
(
self
->
state
.
stage
);
},
},
[
=
](
const
stream
<
int
>&
in
,
std
::
string
&
fname
)
{
[
=
](
const
stream
<
int
>&
in
,
std
::
string
&
fname
)
{
CAF_CHECK_EQUAL
(
fname
,
"numbers.txt"
);
CAF_CHECK_EQUAL
(
fname
,
"numbers.txt"
);
return
self
->
add_in
put
_path
(
in
,
self
->
state
.
stage
);
return
self
->
add_in
bound
_path
(
in
,
self
->
state
.
stage
);
},
},
};
};
}
}
...
...
libcaf_core/test/fused_streaming.cpp
View file @
e730ad4a
...
@@ -225,24 +225,24 @@ TESTEE(stream_multiplexer) {
...
@@ -225,24 +225,24 @@ TESTEE(stream_multiplexer) {
[
=
](
join_atom
,
ints_atom
)
{
[
=
](
join_atom
,
ints_atom
)
{
auto
&
stg
=
self
->
state
.
stage
;
auto
&
stg
=
self
->
state
.
stage
;
CAF_MESSAGE
(
"received 'join' request for integers"
);
CAF_MESSAGE
(
"received 'join' request for integers"
);
auto
result
=
self
->
add_unsafe_out
put
_path
<
int
>
(
stg
);
auto
result
=
self
->
add_unsafe_out
bound
_path
<
int
>
(
stg
);
stg
->
out
().
assign
<
int_scatterer
>
(
result
.
out
());
stg
->
out
().
assign
<
int_scatterer
>
(
result
.
out
());
return
result
;
return
result
;
},
},
[
=
](
join_atom
,
strings_atom
)
{
[
=
](
join_atom
,
strings_atom
)
{
auto
&
stg
=
self
->
state
.
stage
;
auto
&
stg
=
self
->
state
.
stage
;
CAF_MESSAGE
(
"received 'join' request for integers"
);
CAF_MESSAGE
(
"received 'join' request for integers"
);
auto
result
=
self
->
add_unsafe_out
put
_path
<
string
>
(
stg
);
auto
result
=
self
->
add_unsafe_out
bound
_path
<
string
>
(
stg
);
stg
->
out
().
assign
<
string_scatterer
>
(
result
.
out
());
stg
->
out
().
assign
<
string_scatterer
>
(
result
.
out
());
return
result
;
return
result
;
},
},
[
=
](
const
stream
<
int
>&
in
)
{
[
=
](
const
stream
<
int
>&
in
)
{
CAF_MESSAGE
(
"received handshake for integers"
);
CAF_MESSAGE
(
"received handshake for integers"
);
return
self
->
add_unsafe_in
put
_path
<
void
>
(
in
,
self
->
state
.
stage
);
return
self
->
add_unsafe_in
bound
_path
<
void
>
(
in
,
self
->
state
.
stage
);
},
},
[
=
](
const
stream
<
string
>&
in
)
{
[
=
](
const
stream
<
string
>&
in
)
{
CAF_MESSAGE
(
"received handshake for strings"
);
CAF_MESSAGE
(
"received handshake for strings"
);
return
self
->
add_unsafe_in
put
_path
<
void
>
(
in
,
self
->
state
.
stage
);
return
self
->
add_unsafe_in
bound
_path
<
void
>
(
in
,
self
->
state
.
stage
);
}
}
};
};
}
}
...
...
libcaf_core/test/selective_streaming.cpp
View file @
e730ad4a
...
@@ -132,12 +132,12 @@ TESTEE(log_dispatcher) {
...
@@ -132,12 +132,12 @@ TESTEE(log_dispatcher) {
[
=
](
join_atom
,
level
lvl
)
{
[
=
](
join_atom
,
level
lvl
)
{
auto
&
stg
=
self
->
state
.
stage
;
auto
&
stg
=
self
->
state
.
stage
;
CAF_MESSAGE
(
"received 'join' request"
);
CAF_MESSAGE
(
"received 'join' request"
);
auto
result
=
self
->
add_out
put
_path
(
stg
);
auto
result
=
self
->
add_out
bound
_path
(
stg
);
stg
->
out
().
set_filter
(
result
.
out
(),
lvl
);
stg
->
out
().
set_filter
(
result
.
out
(),
lvl
);
return
result
;
return
result
;
},
},
[
=
](
const
stream
<
value_type
>&
in
)
{
[
=
](
const
stream
<
value_type
>&
in
)
{
return
self
->
add_in
put
_path
(
in
,
self
->
state
.
stage
);
return
self
->
add_in
bound
_path
(
in
,
self
->
state
.
stage
);
}
}
};
};
}
}
...
...
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