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
ca51c757
Commit
ca51c757
authored
Apr 04, 2020
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'integration/issue/1076'
Closes #1076.
parents
ef25ccde
c39db78a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
CHANGELOG.md
CHANGELOG.md
+2
-0
libcaf_core/src/scheduled_actor.cpp
libcaf_core/src/scheduled_actor.cpp
+8
-2
libcaf_core/src/stream_manager.cpp
libcaf_core/src/stream_manager.cpp
+2
-1
No files found.
CHANGELOG.md
View file @
ca51c757
...
@@ -147,6 +147,8 @@ is based on [Keep a Changelog](https://keepachangelog.com).
...
@@ -147,6 +147,8 @@ is based on [Keep a Changelog](https://keepachangelog.com).
-
Fix build error in the OpenSSL module under some MSVC configurations
-
Fix build error in the OpenSSL module under some MSVC configurations
-
Serializer and deserializer now accept
`std::chrono::time_point`
for all clock
-
Serializer and deserializer now accept
`std::chrono::time_point`
for all clock
types instead of hard-wiring
`std::system_clock`
.
types instead of hard-wiring
`std::system_clock`
.
-
In some edge cases, actors failed to shut down properly when hosting a stream
source (#1076). The handshake process for a graceful shutdown has been fixed.
## [0.17.4] - 2019-02-08
## [0.17.4] - 2019-02-08
...
...
libcaf_core/src/scheduled_actor.cpp
View file @
ca51c757
...
@@ -1135,9 +1135,15 @@ scheduled_actor::advance_streams(actor_clock::time_point now) {
...
@@ -1135,9 +1135,15 @@ scheduled_actor::advance_streams(actor_clock::time_point now) {
auto
bitmask
=
stream_ticks_
.
timeouts
(
now
,
{
max_batch_delay_ticks_
,
auto
bitmask
=
stream_ticks_
.
timeouts
(
now
,
{
max_batch_delay_ticks_
,
credit_round_ticks_
});
credit_round_ticks_
});
// Force batches on all output paths.
// Force batches on all output paths.
if
((
bitmask
&
0x01
)
!=
0
)
{
if
((
bitmask
&
0x01
)
!=
0
&&
!
stream_managers_
.
empty
())
{
std
::
vector
<
stream_manager
*>
managers
;
managers
.
reserve
(
stream_managers_
.
size
());
for
(
auto
&
kvp
:
stream_managers_
)
for
(
auto
&
kvp
:
stream_managers_
)
kvp
.
second
->
out
().
force_emit_batches
();
managers
.
emplace_back
(
kvp
.
second
.
get
());
std
::
sort
(
managers
.
begin
(),
managers
.
end
());
auto
e
=
std
::
unique
(
managers
.
begin
(),
managers
.
end
());
for
(
auto
i
=
managers
.
begin
();
i
!=
e
;
++
i
)
(
*
i
)
->
out
().
force_emit_batches
();
}
}
// Fill up credit on each input path.
// Fill up credit on each input path.
if
((
bitmask
&
0x02
)
!=
0
)
{
if
((
bitmask
&
0x02
)
!=
0
)
{
...
...
libcaf_core/src/stream_manager.cpp
View file @
ca51c757
...
@@ -113,7 +113,8 @@ void stream_manager::handle(stream_slots slots, upstream_msg::ack_batch& x) {
...
@@ -113,7 +113,8 @@ void stream_manager::handle(stream_slots slots, upstream_msg::ack_batch& x) {
void
stream_manager
::
handle
(
stream_slots
slots
,
upstream_msg
::
drop
&
)
{
void
stream_manager
::
handle
(
stream_slots
slots
,
upstream_msg
::
drop
&
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
slots
));
CAF_LOG_TRACE
(
CAF_ARG
(
slots
));
out
().
close
(
slots
.
receiver
);
error
reason
;
out
().
remove_path
(
slots
.
receiver
,
reason
,
false
);
}
}
void
stream_manager
::
handle
(
stream_slots
slots
,
upstream_msg
::
forced_drop
&
x
)
{
void
stream_manager
::
handle
(
stream_slots
slots
,
upstream_msg
::
forced_drop
&
x
)
{
...
...
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