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
98d8117d
Commit
98d8117d
authored
Jun 15, 2021
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up naming and style nitpicks
parent
7267d945
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
libcaf_io/caf/io/network/rw_state.hpp
libcaf_io/caf/io/network/rw_state.hpp
+2
-2
libcaf_io/src/io/network/stream.cpp
libcaf_io/src/io/network/stream.cpp
+12
-8
libcaf_openssl/src/openssl/session.cpp
libcaf_openssl/src/openssl/session.cpp
+1
-1
No files found.
libcaf_io/caf/io/network/rw_state.hpp
View file @
98d8117d
...
...
@@ -14,8 +14,8 @@ enum class rw_state {
failure
,
/// Reports that an empty buffer is in use and no operation was performed.
indeterminate
,
/// Reports
an ssl error: ssl_error_want_read
ssl_error_
want_read
/// Reports
that the transport wants to read data before it can write again.
want_read
};
}
// namespace caf::io::network
libcaf_io/src/io/network/stream.cpp
View file @
98d8117d
...
...
@@ -144,13 +144,12 @@ bool stream::handle_read_result(rw_state read_result, size_t rb) {
case
rw_state
:
:
indeterminate
:
return
false
;
case
rw_state
:
:
success
:
//
if it is the first rw_state::success after SSL_connect,
//
the ssl connection is established. We recover previous pending write OP
.
if
(
wr_op_backoff_
)
{
//
Recover previous pending write if it is the first successful read after
//
want_read was reported
.
if
(
wr_op_backoff_
)
{
backend
().
add
(
operation
::
write
,
fd
(),
this
);
wr_op_backoff_
=
false
;
}
case
rw_state
:
:
ssl_error_want_read
:
if
(
rb
==
0
)
return
false
;
collected_
+=
rb
;
...
...
@@ -163,6 +162,9 @@ bool stream::handle_read_result(rw_state read_result, size_t rb) {
}
}
break
;
case
rw_state
:
:
want_read
:
CAF_LOG_ERROR
(
"handle_read_result encountered rw_state::want_read"
);
return
false
;
}
return
true
;
}
...
...
@@ -176,13 +178,15 @@ void stream::handle_write_result(rw_state write_result, size_t wb) {
case
rw_state
:
:
indeterminate
:
prepare_next_write
();
break
;
case
rw_state
:
:
ssl_error_want_read
:
// if write op returns ssl_error_want_read, don't write until SSL connection is established.
// otherwise, any write OP will get ssl_error_want_read immediately, causing spinning and high CPU usage.
case
rw_state
:
:
want_read
:
// If the write operation returns want_read, we need to suspend writing to
// the socket until the next successful read. Otherwise, we may cause
// spinning and high CPU usage.
backend
().
del
(
operation
::
write
,
fd
(),
this
);
wr_op_backoff_
=
true
;
if
(
wb
==
0
)
if
(
wb
==
0
)
break
;
[[
fallthrough
]];
case
rw_state
:
:
success
:
written_
+=
wb
;
CAF_ASSERT
(
written_
<=
wr_buf_
.
size
());
...
...
libcaf_openssl/src/openssl/session.cpp
View file @
98d8117d
...
...
@@ -94,7 +94,7 @@ rw_state session::do_some(int (*f)(SSL*, void*, int), size_t& result, void* buf,
return
rw_state
::
failure
;
case
SSL_ERROR_WANT_READ
:
CAF_LOG_DEBUG
(
"SSL_ERROR_WANT_READ reported"
);
return
rw_state
::
ssl_error_
want_read
;
return
rw_state
::
want_read
;
case
SSL_ERROR_WANT_WRITE
:
CAF_LOG_DEBUG
(
"SSL_ERROR_WANT_WRITE reported"
);
// Report success to poll on this socket.
...
...
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