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
6d463489
Commit
6d463489
authored
Dec 17, 2019
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build with profiling enabled
parent
24635441
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
libcaf_core/caf/actor_system.hpp
libcaf_core/caf/actor_system.hpp
+3
-3
libcaf_core/src/blocking_actor.cpp
libcaf_core/src/blocking_actor.cpp
+1
-1
libcaf_core/src/raw_event_based_actor.cpp
libcaf_core/src/raw_event_based_actor.cpp
+1
-1
libcaf_core/src/scheduled_actor.cpp
libcaf_core/src/scheduled_actor.cpp
+1
-1
No files found.
libcaf_core/caf/actor_system.hpp
View file @
6d463489
...
@@ -563,10 +563,10 @@ public:
...
@@ -563,10 +563,10 @@ public:
profiler_
->
remove_actor
(
self
);
profiler_
->
remove_actor
(
self
);
}
}
void
profiler_before_processing
(
const
local_actor
&
self
,
template
<
class
...
Ts
>
const
mailbox_element
&
element
)
{
void
profiler_before_processing
(
const
local_actor
&
self
,
Ts
&&
...
xs
)
{
if
(
profiler_
)
if
(
profiler_
)
profiler_
->
before_processing
(
self
,
element
);
profiler_
->
before_processing
(
self
,
std
::
forward
<
Ts
>
(
xs
)...
);
}
}
void
profiler_after_processing
(
const
local_actor
&
self
,
void
profiler_after_processing
(
const
local_actor
&
self
,
...
...
libcaf_core/src/blocking_actor.cpp
View file @
6d463489
...
@@ -140,7 +140,7 @@ void blocking_actor::receive_response(message_id id,
...
@@ -140,7 +140,7 @@ void blocking_actor::receive_response(message_id id,
if
(
id
!=
x
.
mid
)
if
(
id
!=
x
.
mid
)
return
intrusive
::
task_result
::
skip
;
return
intrusive
::
task_result
::
skip
;
CAF_LOG_RECEIVE_EVENT
((
&
x
));
CAF_LOG_RECEIVE_EVENT
((
&
x
));
CAF_BEFORE_PROCESSING
(
self
,
x
,
id
,
send_time
);
CAF_BEFORE_PROCESSING
(
this
,
x
,
id
,
send_time
);
// Blocking actors can nest receives => push/pop `current_element_`
// Blocking actors can nest receives => push/pop `current_element_`
auto
prev
=
current_element_
;
auto
prev
=
current_element_
;
current_element_
=
&
x
;
current_element_
=
&
x
;
...
...
libcaf_core/src/raw_event_based_actor.cpp
View file @
6d463489
...
@@ -63,7 +63,7 @@ invoke_message_result raw_event_based_actor::consume(mailbox_element& x) {
...
@@ -63,7 +63,7 @@ invoke_message_result raw_event_based_actor::consume(mailbox_element& x) {
return
invoke_message_result
::
dropped
;
return
invoke_message_result
::
dropped
;
}
}
CAF_LOG_RECEIVE_EVENT
(
current_element_
);
CAF_LOG_RECEIVE_EVENT
(
current_element_
);
CAF_BEFORE_PROCESSING
(
this
,
x
,
mrh
->
first
,
mr
t
h
->
second
.
send_time
);
CAF_BEFORE_PROCESSING
(
this
,
x
,
mrh
->
first
,
mrh
->
second
.
send_time
);
auto
bhvr
=
std
::
move
(
mrh
->
second
.
bhvr
);
auto
bhvr
=
std
::
move
(
mrh
->
second
.
bhvr
);
multiplexed_responses_
.
erase
(
mrh
);
multiplexed_responses_
.
erase
(
mrh
);
if
(
!
invoke
(
bhvr
,
x
))
{
if
(
!
invoke
(
bhvr
,
x
))
{
...
...
libcaf_core/src/scheduled_actor.cpp
View file @
6d463489
...
@@ -665,7 +665,7 @@ invoke_message_result scheduled_actor::consume(mailbox_element& x) {
...
@@ -665,7 +665,7 @@ invoke_message_result scheduled_actor::consume(mailbox_element& x) {
return
invoke_message_result
::
dropped
;
return
invoke_message_result
::
dropped
;
}
}
CAF_LOG_RECEIVE_EVENT
(
current_element_
);
CAF_LOG_RECEIVE_EVENT
(
current_element_
);
CAF_BEFORE_PROCESSING
(
this
,
x
,
mrh
->
first
,
mr
t
h
->
second
.
send_time
);
CAF_BEFORE_PROCESSING
(
this
,
x
,
mrh
->
first
,
mrh
->
second
.
send_time
);
auto
bhvr
=
std
::
move
(
mrh
->
second
.
bhvr
);
auto
bhvr
=
std
::
move
(
mrh
->
second
.
bhvr
);
multiplexed_responses_
.
erase
(
mrh
);
multiplexed_responses_
.
erase
(
mrh
);
if
(
!
invoke
(
bhvr
,
x
))
{
if
(
!
invoke
(
bhvr
,
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