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
ff74ba2f
Commit
ff74ba2f
authored
Sep 06, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix problem with recv for TCP transport
parent
aac0abf4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
libcaf_io/src/newb_tcp.cpp
libcaf_io/src/newb_tcp.cpp
+13
-12
No files found.
libcaf_io/src/newb_tcp.cpp
View file @
ff74ba2f
...
...
@@ -63,12 +63,12 @@ namespace caf {
namespace
policy
{
tcp_transport
::
tcp_transport
()
:
read_threshold
{
0
},
:
read_threshold
{
1
},
collected
{
0
},
maximum
{
0
},
writing
{
false
},
written
{
0
}
{
// nop
configure_read
(
io
::
receive_policy
::
at_most
(
1024
));
}
io
::
network
::
rw_state
tcp_transport
::
read_some
(
io
::
network
::
newb_base
*
parent
)
{
...
...
@@ -78,10 +78,16 @@ io::network::rw_state tcp_transport::read_some(io::network::newb_base* parent) {
auto
sres
=
::
recv
(
parent
->
fd
(),
reinterpret_cast
<
io
::
network
::
socket_recv_ptr
>
(
buf
),
len
,
io
::
network
::
no_sigpipe_io_flag
);
if
(
io
::
network
::
is_error
(
sres
,
true
)
||
sres
==
0
)
{
// Recv returns 0 when the peer has performed an orderly shutdown.
if
(
sres
<
0
)
{
auto
err
=
io
::
network
::
last_socket_error
();
if
(
io
::
network
::
would_block_or_temporarily_unavailable
(
err
))
return
io
::
network
::
rw_state
::
indeterminate
;
CAF_LOG_DEBUG
(
"recv failed"
<<
CAF_ARG
(
sres
));
return
io
::
network
::
rw_state
::
failure
;
}
else
if
(
sres
==
0
)
{
// Recv returns 0 when the peer has performed an orderly shutdown.
CAF_LOG_DEBUG
(
"peer shutdown"
);
return
io
::
network
::
rw_state
::
failure
;
}
size_t
result
=
(
sres
>
0
)
?
static_cast
<
size_t
>
(
sres
)
:
0
;
collected
+=
result
;
...
...
@@ -148,8 +154,7 @@ void tcp_transport::prepare_next_write(io::network::newb_base* parent) {
written
=
0
;
send_buffer
.
clear
();
if
(
offline_buffer
.
empty
())
{
parent
->
backend
().
del
(
io
::
network
::
operation
::
write
,
parent
->
fd
(),
parent
);
parent
->
backend
().
del
(
io
::
network
::
operation
::
write
,
parent
->
fd
(),
parent
);
writing
=
false
;
}
else
{
send_buffer
.
swap
(
offline_buffer
);
...
...
@@ -160,8 +165,7 @@ void tcp_transport::flush(io::network::newb_base* parent) {
CAF_ASSERT
(
parent
!=
nullptr
);
CAF_LOG_TRACE
(
CAF_ARG
(
offline_buffer
.
size
()));
if
(
!
offline_buffer
.
empty
()
&&
!
writing
)
{
parent
->
backend
().
add
(
io
::
network
::
operation
::
write
,
parent
->
fd
(),
parent
);
parent
->
backend
().
add
(
io
::
network
::
operation
::
write
,
parent
->
fd
(),
parent
);
writing
=
true
;
prepare_next_write
(
parent
);
}
...
...
@@ -170,10 +174,7 @@ void tcp_transport::flush(io::network::newb_base* parent) {
expected
<
io
::
network
::
native_socket
>
tcp_transport
::
connect
(
const
std
::
string
&
host
,
uint16_t
port
,
optional
<
io
::
network
::
protocol
::
network
>
preferred
)
{
auto
res
=
io
::
network
::
new_tcp_connection
(
host
,
port
,
preferred
);
if
(
!
res
)
std
::
cerr
<<
"failed to create new TCP connection"
<<
std
::
endl
;
return
res
;
return
io
::
network
::
new_tcp_connection
(
host
,
port
,
preferred
);
}
expected
<
io
::
network
::
native_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