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
001a9721
Commit
001a9721
authored
Apr 19, 2016
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve logging of BASP broker and local_actor
parent
30af059b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
libcaf_core/src/local_actor.cpp
libcaf_core/src/local_actor.cpp
+1
-0
libcaf_io/src/basp_broker.cpp
libcaf_io/src/basp_broker.cpp
+1
-1
libcaf_io/src/instance.cpp
libcaf_io/src/instance.cpp
+22
-3
No files found.
libcaf_core/src/local_actor.cpp
View file @
001a9721
...
@@ -55,6 +55,7 @@ result<message> skip_unexpected(local_actor*, const type_erased_tuple*) {
...
@@ -55,6 +55,7 @@ result<message> skip_unexpected(local_actor*, const type_erased_tuple*) {
result
<
message
>
print_and_drop_unexpected
(
local_actor
*
self
,
result
<
message
>
print_and_drop_unexpected
(
local_actor
*
self
,
const
type_erased_tuple
*
x
)
{
const
type_erased_tuple
*
x
)
{
CAF_LOG_WARNING
(
"unexpected message"
<<
CAF_ARG
(
*
x
));
aout
(
self
)
<<
"*** unexpected message [id: "
<<
self
->
id
()
aout
(
self
)
<<
"*** unexpected message [id: "
<<
self
->
id
()
<<
", name: "
<<
self
->
name
()
<<
"]: "
<<
x
->
stringify
()
<<
", name: "
<<
self
->
name
()
<<
"]: "
<<
x
->
stringify
()
<<
std
::
endl
;
<<
std
::
endl
;
...
...
libcaf_io/src/basp_broker.cpp
View file @
001a9721
...
@@ -434,7 +434,7 @@ basp_broker::basp_broker(actor_config& cfg)
...
@@ -434,7 +434,7 @@ basp_broker::basp_broker(actor_config& cfg)
}
}
behavior
basp_broker
::
make_behavior
()
{
behavior
basp_broker
::
make_behavior
()
{
CAF_LOG_TRACE
(
""
);
CAF_LOG_TRACE
(
CAF_ARG
(
system
().
node
())
);
if
(
system
().
middleman
().
enable_automatic_connections
())
{
if
(
system
().
middleman
().
enable_automatic_connections
())
{
CAF_LOG_INFO
(
"enable automatic connections"
);
CAF_LOG_INFO
(
"enable automatic connections"
);
// open a random port and store a record for our peers how to
// open a random port and store a record for our peers how to
...
...
libcaf_io/src/instance.cpp
View file @
001a9721
...
@@ -48,7 +48,7 @@ instance::instance(abstract_broker* parent, callee& lstnr)
...
@@ -48,7 +48,7 @@ instance::instance(abstract_broker* parent, callee& lstnr)
connection_state
instance
::
handle
(
execution_unit
*
ctx
,
connection_state
instance
::
handle
(
execution_unit
*
ctx
,
new_data_msg
&
dm
,
header
&
hdr
,
new_data_msg
&
dm
,
header
&
hdr
,
bool
is_payload
)
{
bool
is_payload
)
{
CAF_LOG_TRACE
(
""
);
CAF_LOG_TRACE
(
CAF_ARG
(
dm
)
<<
CAF_ARG
(
hdr
)
<<
CAF_ARG
(
is_payload
)
);
// function object providing cleanup code on errors
// function object providing cleanup code on errors
auto
err
=
[
&
]()
->
connection_state
{
auto
err
=
[
&
]()
->
connection_state
{
auto
cb
=
make_callback
([
&
](
const
node_id
&
nid
){
auto
cb
=
make_callback
([
&
](
const
node_id
&
nid
){
...
@@ -206,6 +206,7 @@ connection_state instance::handle(execution_unit* ctx,
...
@@ -206,6 +206,7 @@ connection_state instance::handle(execution_unit* ctx,
}
}
void
instance
::
handle_heartbeat
(
execution_unit
*
ctx
)
{
void
instance
::
handle_heartbeat
(
execution_unit
*
ctx
)
{
CAF_LOG_TRACE
(
""
);
for
(
auto
&
kvp
:
tbl_
.
direct_by_hdl_
)
{
for
(
auto
&
kvp
:
tbl_
.
direct_by_hdl_
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
kvp
.
first
)
<<
CAF_ARG
(
kvp
.
second
));
CAF_LOG_TRACE
(
CAF_ARG
(
kvp
.
first
)
<<
CAF_ARG
(
kvp
.
second
));
write_heartbeat
(
ctx
,
tbl_
.
parent_
->
wr_buf
(
kvp
.
first
),
kvp
.
second
);
write_heartbeat
(
ctx
,
tbl_
.
parent_
->
wr_buf
(
kvp
.
first
),
kvp
.
second
);
...
@@ -234,6 +235,7 @@ void instance::flush(const routing_table::route& path) {
...
@@ -234,6 +235,7 @@ void instance::flush(const routing_table::route& path) {
void
instance
::
write
(
execution_unit
*
ctx
,
const
routing_table
::
route
&
r
,
void
instance
::
write
(
execution_unit
*
ctx
,
const
routing_table
::
route
&
r
,
header
&
hdr
,
payload_writer
*
writer
)
{
header
&
hdr
,
payload_writer
*
writer
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
hdr
));
CAF_ASSERT
(
hdr
.
payload_len
==
0
||
writer
!=
nullptr
);
CAF_ASSERT
(
hdr
.
payload_len
==
0
||
writer
!=
nullptr
);
write
(
ctx
,
r
.
wr_buf
,
hdr
,
writer
);
write
(
ctx
,
r
.
wr_buf
,
hdr
,
writer
);
tbl_
.
flush
(
r
);
tbl_
.
flush
(
r
);
...
@@ -242,6 +244,8 @@ void instance::write(execution_unit* ctx, const routing_table::route& r,
...
@@ -242,6 +244,8 @@ void instance::write(execution_unit* ctx, const routing_table::route& r,
void
instance
::
add_published_actor
(
uint16_t
port
,
void
instance
::
add_published_actor
(
uint16_t
port
,
strong_actor_ptr
published_actor
,
strong_actor_ptr
published_actor
,
std
::
set
<
std
::
string
>
published_interface
)
{
std
::
set
<
std
::
string
>
published_interface
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
port
)
<<
CAF_ARG
(
published_actor
)
<<
CAF_ARG
(
published_interface
));
using
std
::
swap
;
using
std
::
swap
;
auto
&
entry
=
published_actors_
[
port
];
auto
&
entry
=
published_actors_
[
port
];
swap
(
entry
.
first
,
published_actor
);
swap
(
entry
.
first
,
published_actor
);
...
@@ -251,6 +255,7 @@ void instance::add_published_actor(uint16_t port,
...
@@ -251,6 +255,7 @@ void instance::add_published_actor(uint16_t port,
size_t
instance
::
remove_published_actor
(
uint16_t
port
,
size_t
instance
::
remove_published_actor
(
uint16_t
port
,
removed_published_actor
*
cb
)
{
removed_published_actor
*
cb
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
port
));
auto
i
=
published_actors_
.
find
(
port
);
auto
i
=
published_actors_
.
find
(
port
);
if
(
i
==
published_actors_
.
end
())
if
(
i
==
published_actors_
.
end
())
return
0
;
return
0
;
...
@@ -263,6 +268,7 @@ size_t instance::remove_published_actor(uint16_t port,
...
@@ -263,6 +268,7 @@ size_t instance::remove_published_actor(uint16_t port,
size_t
instance
::
remove_published_actor
(
const
actor_addr
&
whom
,
size_t
instance
::
remove_published_actor
(
const
actor_addr
&
whom
,
uint16_t
port
,
uint16_t
port
,
removed_published_actor
*
cb
)
{
removed_published_actor
*
cb
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
whom
)
<<
CAF_ARG
(
port
));
size_t
result
=
0
;
size_t
result
=
0
;
if
(
port
!=
0
)
{
if
(
port
!=
0
)
{
auto
i
=
published_actors_
.
find
(
port
);
auto
i
=
published_actors_
.
find
(
port
);
...
@@ -292,7 +298,8 @@ bool instance::dispatch(execution_unit* ctx, const strong_actor_ptr& sender,
...
@@ -292,7 +298,8 @@ bool instance::dispatch(execution_unit* ctx, const strong_actor_ptr& sender,
const
std
::
vector
<
strong_actor_ptr
>&
forwarding_stack
,
const
std
::
vector
<
strong_actor_ptr
>&
forwarding_stack
,
const
strong_actor_ptr
&
receiver
,
message_id
mid
,
const
strong_actor_ptr
&
receiver
,
message_id
mid
,
const
message
&
msg
)
{
const
message
&
msg
)
{
CAF_LOG_TRACE
(
""
);
CAF_LOG_TRACE
(
CAF_ARG
(
sender
)
<<
CAF_ARG
(
receiver
)
<<
CAF_ARG
(
mid
)
<<
CAF_ARG
(
msg
));
CAF_ASSERT
(
receiver
&&
system
().
node
()
!=
receiver
->
node
());
CAF_ASSERT
(
receiver
&&
system
().
node
()
!=
receiver
->
node
());
auto
path
=
lookup
(
receiver
->
node
());
auto
path
=
lookup
(
receiver
->
node
());
if
(
!
path
)
{
if
(
!
path
)
{
...
@@ -321,7 +328,11 @@ void instance::write(execution_unit* ctx,
...
@@ -321,7 +328,11 @@ void instance::write(execution_unit* ctx,
actor_id
source_actor
,
actor_id
source_actor
,
actor_id
dest_actor
,
actor_id
dest_actor
,
payload_writer
*
pw
)
{
payload_writer
*
pw
)
{
if
(
!
pw
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
operation
)
<<
CAF_ARG
(
payload_len
)
<<
CAF_ARG
(
operation_data
)
<<
CAF_ARG
(
source_node
)
<<
CAF_ARG
(
dest_node
)
<<
CAF_ARG
(
source_actor
)
<<
CAF_ARG
(
dest_actor
));
if
(
!
pw
)
{
uint32_t
zero
=
0
;
uint32_t
zero
=
0
;
binary_serializer
bs
{
ctx
,
std
::
back_inserter
(
buf
)};
binary_serializer
bs
{
ctx
,
std
::
back_inserter
(
buf
)};
bs
<<
source_node
bs
<<
source_node
...
@@ -358,6 +369,7 @@ void instance::write(execution_unit* ctx,
...
@@ -358,6 +369,7 @@ void instance::write(execution_unit* ctx,
void
instance
::
write
(
execution_unit
*
ctx
,
buffer_type
&
buf
,
void
instance
::
write
(
execution_unit
*
ctx
,
buffer_type
&
buf
,
header
&
hdr
,
payload_writer
*
pw
)
{
header
&
hdr
,
payload_writer
*
pw
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
hdr
));
write
(
ctx
,
buf
,
hdr
.
operation
,
&
hdr
.
payload_len
,
hdr
.
operation_data
,
write
(
ctx
,
buf
,
hdr
.
operation
,
&
hdr
.
payload_len
,
hdr
.
operation_data
,
hdr
.
source_node
,
hdr
.
dest_node
,
hdr
.
source_actor
,
hdr
.
dest_actor
,
pw
);
hdr
.
source_node
,
hdr
.
dest_node
,
hdr
.
source_actor
,
hdr
.
dest_actor
,
pw
);
}
}
...
@@ -365,6 +377,7 @@ void instance::write(execution_unit* ctx, buffer_type& buf,
...
@@ -365,6 +377,7 @@ void instance::write(execution_unit* ctx, buffer_type& buf,
void
instance
::
write_server_handshake
(
execution_unit
*
ctx
,
void
instance
::
write_server_handshake
(
execution_unit
*
ctx
,
buffer_type
&
out_buf
,
buffer_type
&
out_buf
,
optional
<
uint16_t
>
port
)
{
optional
<
uint16_t
>
port
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
port
));
using
namespace
detail
;
using
namespace
detail
;
published_actor
*
pa
=
nullptr
;
published_actor
*
pa
=
nullptr
;
if
(
port
)
{
if
(
port
)
{
...
@@ -372,6 +385,7 @@ void instance::write_server_handshake(execution_unit* ctx,
...
@@ -372,6 +385,7 @@ void instance::write_server_handshake(execution_unit* ctx,
if
(
i
!=
published_actors_
.
end
())
if
(
i
!=
published_actors_
.
end
())
pa
=
&
i
->
second
;
pa
=
&
i
->
second
;
}
}
CAF_LOG_DEBUG_IF
(
!
pa
&&
port
,
"no actor published"
);
auto
writer
=
make_callback
([
&
](
serializer
&
sink
)
{
auto
writer
=
make_callback
([
&
](
serializer
&
sink
)
{
if
(
pa
)
{
if
(
pa
)
{
auto
i
=
pa
->
first
?
pa
->
first
->
id
()
:
invalid_actor_id
;
auto
i
=
pa
->
first
?
pa
->
first
->
id
()
:
invalid_actor_id
;
...
@@ -388,6 +402,7 @@ void instance::write_server_handshake(execution_unit* ctx,
...
@@ -388,6 +402,7 @@ void instance::write_server_handshake(execution_unit* ctx,
void
instance
::
write_client_handshake
(
execution_unit
*
ctx
,
void
instance
::
write_client_handshake
(
execution_unit
*
ctx
,
buffer_type
&
buf
,
buffer_type
&
buf
,
const
node_id
&
remote_side
)
{
const
node_id
&
remote_side
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
remote_side
));
write
(
ctx
,
buf
,
message_type
::
client_handshake
,
nullptr
,
0
,
write
(
ctx
,
buf
,
message_type
::
client_handshake
,
nullptr
,
0
,
this_node_
,
remote_side
,
invalid_actor_id
,
invalid_actor_id
);
this_node_
,
remote_side
,
invalid_actor_id
,
invalid_actor_id
);
}
}
...
@@ -399,6 +414,8 @@ void instance::write_dispatch_error(execution_unit* ctx,
...
@@ -399,6 +414,8 @@ void instance::write_dispatch_error(execution_unit* ctx,
error_code
ec
,
error_code
ec
,
const
header
&
original_hdr
,
const
header
&
original_hdr
,
buffer_type
*
payload
)
{
buffer_type
*
payload
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
source_node
)
<<
CAF_ARG
(
dest_node
)
<<
CAF_ARG
(
ec
)
<<
CAF_ARG
(
original_hdr
));
auto
writer
=
make_callback
([
&
](
serializer
&
sink
)
{
auto
writer
=
make_callback
([
&
](
serializer
&
sink
)
{
sink
<<
original_hdr
;
sink
<<
original_hdr
;
if
(
payload
)
if
(
payload
)
...
@@ -416,6 +433,7 @@ void instance::write_kill_proxy_instance(execution_unit* ctx,
...
@@ -416,6 +433,7 @@ void instance::write_kill_proxy_instance(execution_unit* ctx,
const
node_id
&
dest_node
,
const
node_id
&
dest_node
,
actor_id
aid
,
actor_id
aid
,
exit_reason
rsn
)
{
exit_reason
rsn
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
dest_node
)
<<
CAF_ARG
(
aid
)
<<
CAF_ARG
(
rsn
));
header
hdr
{
message_type
::
kill_proxy_instance
,
0
,
static_cast
<
uint32_t
>
(
rsn
),
header
hdr
{
message_type
::
kill_proxy_instance
,
0
,
static_cast
<
uint32_t
>
(
rsn
),
this_node_
,
dest_node
,
aid
,
invalid_actor_id
};
this_node_
,
dest_node
,
aid
,
invalid_actor_id
};
write
(
ctx
,
buf
,
hdr
);
write
(
ctx
,
buf
,
hdr
);
...
@@ -424,6 +442,7 @@ void instance::write_kill_proxy_instance(execution_unit* ctx,
...
@@ -424,6 +442,7 @@ void instance::write_kill_proxy_instance(execution_unit* ctx,
void
instance
::
write_heartbeat
(
execution_unit
*
ctx
,
void
instance
::
write_heartbeat
(
execution_unit
*
ctx
,
buffer_type
&
buf
,
buffer_type
&
buf
,
const
node_id
&
remote_side
)
{
const
node_id
&
remote_side
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
remote_side
));
write
(
ctx
,
buf
,
message_type
::
heartbeat
,
nullptr
,
0
,
write
(
ctx
,
buf
,
message_type
::
heartbeat
,
nullptr
,
0
,
this_node_
,
remote_side
,
invalid_actor_id
,
invalid_actor_id
);
this_node_
,
remote_side
,
invalid_actor_id
,
invalid_actor_id
);
}
}
...
...
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