Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
las3_pub
/
predictable_parallel_patterns
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2faad2e8
authored
May 03, 2019
by
FritzFlorian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo in invoke_parallel.
This resulted from an merge gone wrong.
parent
c825214a
Pipeline
#1164
passed with stages
in 3 minutes 44 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
lib/pls/include/pls/algorithms/invoke_parallel_impl.h
+5
-4
No files found.
lib/pls/include/pls/algorithms/invoke_parallel_impl.h
View file @
2faad2e8
...
...
@@ -22,7 +22,7 @@ inline void run_body(const Body &internal_body, const abstract_task::id &id) {
if
(
current_task
->
unique_id
()
==
id
)
{
internal_body
();
}
else
{
fork_join_lambda_by_reference
<
Body
>
root_body
(
&
internal_body
);
fork_join_lambda_by_reference
<
Body
>
root_body
(
internal_body
);
fork_join_task
root_task
{
&
root_body
,
id
};
scheduler
::
execute_task
(
root_task
);
}
...
...
@@ -36,12 +36,13 @@ void invoke_parallel(const Function1 &function1, const Function2 &function2) {
using
namespace
::
pls
::
internal
::
base
;
static
abstract_task
::
id
id
=
unique_id
::
create
<
Function1
,
Function2
>
();
auto
internal_body
=
[
&
](
fork_join_sub_task
*
this_task
)
{
auto
internal_body
=
[
&
]()
{
auto
current_task
=
fork_join_sub_task
::
current
();
auto
sub_task_2
=
fork_join_lambda_by_reference
<
Function2
>
(
function2
);
this
_task
->
spawn_child
(
sub_task_2
);
current
_task
->
spawn_child
(
sub_task_2
);
function1
();
// Execute first function 'inline' without spawning a sub_task object
this
_task
->
wait_for_all
();
current
_task
->
wait_for_all
();
};
internal
::
run_body
(
internal_body
,
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