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
8ece93c8
Commit
8ece93c8
authored
Dec 24, 2017
by
Marian Triebe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build with logging enabled
parent
bec8b3fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
libcaf_io/src/connection_helper.cpp
libcaf_io/src/connection_helper.cpp
+4
-6
libcaf_io/src/test_multiplexer.cpp
libcaf_io/src/test_multiplexer.cpp
+1
-1
No files found.
libcaf_io/src/connection_helper.cpp
View file @
8ece93c8
...
@@ -61,8 +61,7 @@ behavior datagram_connection_broker(broker* self, uint16_t port,
...
@@ -61,8 +61,7 @@ behavior datagram_connection_broker(broker* self, uint16_t port,
after
(
autoconnect_timeout
)
>>
[
=
]()
{
after
(
autoconnect_timeout
)
>>
[
=
]()
{
CAF_LOG_TRACE
(
CAF_ARG
(
""
));
CAF_LOG_TRACE
(
CAF_ARG
(
""
));
// nothing heard in about 10 minutes... just a call it a day, then
// nothing heard in about 10 minutes... just a call it a day, then
CAF_LOG_INFO
(
"aborted direct connection attempt after 10min:"
CAF_LOG_INFO
(
"aborted direct connection attempt after 10min"
);
<<
CAF_ARG
(
nid
));
self
->
quit
(
exit_reason
::
user_shutdown
);
self
->
quit
(
exit_reason
::
user_shutdown
);
}
}
};
};
...
@@ -70,7 +69,7 @@ behavior datagram_connection_broker(broker* self, uint16_t port,
...
@@ -70,7 +69,7 @@ behavior datagram_connection_broker(broker* self, uint16_t port,
behavior
connection_helper
(
stateful_actor
<
connection_helper_state
>*
self
,
behavior
connection_helper
(
stateful_actor
<
connection_helper_state
>*
self
,
actor
b
)
{
actor
b
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
s
));
CAF_LOG_TRACE
(
CAF_ARG
(
b
));
self
->
monitor
(
b
);
self
->
monitor
(
b
);
self
->
set_down_handler
([
=
](
down_msg
&
dm
)
{
self
->
set_down_handler
([
=
](
down_msg
&
dm
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
dm
));
CAF_LOG_TRACE
(
CAF_ARG
(
dm
));
...
@@ -99,7 +98,7 @@ behavior connection_helper(stateful_actor<connection_helper_state>* self,
...
@@ -99,7 +98,7 @@ behavior connection_helper(stateful_actor<connection_helper_state>* self,
}
}
}
}
}
}
CAF_LOG_INFO
(
"could not connect to node directly
:"
<<
CAF_ARG
(
nid
)
);
CAF_LOG_INFO
(
"could not connect to node directly
"
);
}
else
if
(
item
==
"basp.default-connectivity-udp"
)
{
}
else
if
(
item
==
"basp.default-connectivity-udp"
)
{
// create new broker to try addresses for communication via UDP
// create new broker to try addresses for communication via UDP
if
(
self
->
system
().
config
().
middleman_detach_utility_actors
)
{
if
(
self
->
system
().
config
().
middleman_detach_utility_actors
)
{
...
@@ -121,8 +120,7 @@ behavior connection_helper(stateful_actor<connection_helper_state>* self,
...
@@ -121,8 +120,7 @@ behavior connection_helper(stateful_actor<connection_helper_state>* self,
after
(
autoconnect_timeout
)
>>
[
=
]
{
after
(
autoconnect_timeout
)
>>
[
=
]
{
CAF_LOG_TRACE
(
CAF_ARG
(
""
));
CAF_LOG_TRACE
(
CAF_ARG
(
""
));
// nothing heard in about 10 minutes... just a call it a day, then
// nothing heard in about 10 minutes... just a call it a day, then
CAF_LOG_INFO
(
"aborted direct connection attempt after 10min:"
CAF_LOG_INFO
(
"aborted direct connection attempt after 10min"
);
<<
CAF_ARG
(
nid
));
self
->
quit
(
exit_reason
::
user_shutdown
);
self
->
quit
(
exit_reason
::
user_shutdown
);
}
}
};
};
...
...
libcaf_io/src/test_multiplexer.cpp
View file @
8ece93c8
...
@@ -932,7 +932,7 @@ void test_multiplexer::virtual_send(connection_handle hdl,
...
@@ -932,7 +932,7 @@ void test_multiplexer::virtual_send(connection_handle hdl,
void
test_multiplexer
::
virtual_send
(
datagram_handle
dst
,
datagram_handle
ep
,
void
test_multiplexer
::
virtual_send
(
datagram_handle
dst
,
datagram_handle
ep
,
const
buffer_type
&
buf
)
{
const
buffer_type
&
buf
)
{
CAF_ASSERT
(
std
::
this_thread
::
get_id
()
==
tid_
);
CAF_ASSERT
(
std
::
this_thread
::
get_id
()
==
tid_
);
CAF_LOG_TRACE
(
CAF_ARG
(
hdl
));
CAF_LOG_TRACE
(
CAF_ARG
(
dst
)
<<
CAF_ARG
(
ep
));
auto
&
vb
=
virtual_network_buffer
(
dst
);
auto
&
vb
=
virtual_network_buffer
(
dst
);
vb
.
emplace_back
(
ep
,
buf
);
vb
.
emplace_back
(
ep
,
buf
);
read_data
(
dst
);
read_data
(
dst
);
...
...
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