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
0228aa92
authored
Jun 07, 2019
by
FritzFlorian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to re-use main thread as worker.
parent
18cd7cf7
Pipeline
#1259
failed with stages
in 60 minutes 47 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
13 deletions
+32
-13
lib/pls/include/pls/internal/scheduling/scheduler.h
+2
-1
lib/pls/include/pls/internal/scheduling/scheduler_impl.h
+20
-9
lib/pls/include/pls/internal/scheduling/task.h
+2
-1
lib/pls/src/internal/scheduling/scheduler.cpp
+8
-2
No files found.
lib/pls/include/pls/internal/scheduling/scheduler.h
View file @
0228aa92
...
...
@@ -32,6 +32,7 @@ using scheduler_thread = base::thread<decltype(&worker_routine), thread_state>;
class
scheduler
{
friend
class
task
;
const
unsigned
int
num_threads_
;
const
bool
reuse_thread_
;
scheduler_memory
*
memory_
;
base
::
barrier
sync_barrier_
;
...
...
@@ -49,7 +50,7 @@ class scheduler {
* @param memory All memory is allocated statically, thus the user is required to provide the memory instance.
* @param num_threads The number of worker threads to be created.
*/
explicit
scheduler
(
scheduler_memory
*
memory
,
unsigned
int
num_threads
);
explicit
scheduler
(
scheduler_memory
*
memory
,
unsigned
int
num_threads
,
bool
reuse_thread
=
true
);
/**
* The scheduler is implicitly terminated as soon as it leaves the scope.
...
...
lib/pls/include/pls/internal/scheduling/scheduler_impl.h
View file @
0228aa92
...
...
@@ -14,19 +14,30 @@ template<typename Function>
void
scheduler
::
perform_work
(
Function
work_section
)
{
PROFILE_WORK_BLOCK
(
"scheduler::perform_work"
)
// if (execute_main_thread) {
// work_section();
//
// sync_barrier_.wait(); // Trigger threads to wake up
// sync_barrier_.wait(); // Wait for threads to finish
// } else {
// Prepare main root task
lambda_task_by_reference
<
Function
>
root_task
{
work_section
};
main_thread_root_task_
=
&
root_task
;
work_section_done_
=
false
;
sync_barrier_
.
wait
();
// Trigger threads to wake up
sync_barrier_
.
wait
();
// Wait for threads to finish
// }
if
(
reuse_thread_
)
{
// TODO: See if we should change thread-states to not make our state override the current thread state
auto
my_state
=
memory_
->
thread_state_for
(
0
);
base
::
this_thread
::
set_state
(
my_state
);
// Make THIS THREAD become the main worker
sync_barrier_
.
wait
();
// Trigger threads to wake up
// Do work (see if we can remove this duplicated code)
root_task
.
parent_
=
nullptr
;
root_task
.
deque_state_
=
my_state
->
deque_
.
save_state
();
root_task
.
execute
();
work_section_done_
=
true
;
sync_barrier_
.
wait
();
// Wait for threads to finish
}
else
{
// Simply trigger the others to do the work, this thread will sleep/wait for the time being
sync_barrier_
.
wait
();
// Trigger threads to wake up
sync_barrier_
.
wait
();
// Wait for threads to finish
}
}
template
<
typename
T
>
...
...
lib/pls/include/pls/internal/scheduling/task.h
View file @
0228aa92
...
...
@@ -62,12 +62,13 @@ void task::spawn_child(T &&sub_task) {
template
<
typename
T
>
void
task
::
spawn_child_and_wait
(
T
&&
sub_task
)
{
PROFILE_FORK_JOIN_STEALING
(
"spawn_child"
)
PROFILE_FORK_JOIN_STEALING
(
"spawn_child
_wait
"
)
static_assert
(
std
::
is_base_of
<
task
,
typename
std
::
remove_reference
<
T
>::
type
>::
value
,
"Only pass task subclasses!"
);
// Assign forced values (for stack and parent management)
sub_task
.
parent_
=
nullptr
;
sub_task
.
deque_state_
=
thread_state
::
get
()
->
deque_
.
save_state
();
PROFILE_END_BLOCK
sub_task
.
execute
();
wait_for_all
();
...
...
lib/pls/src/internal/scheduling/scheduler.cpp
View file @
0228aa92
...
...
@@ -8,10 +8,11 @@ namespace pls {
namespace
internal
{
namespace
scheduling
{
scheduler
::
scheduler
(
scheduler_memory
*
memory
,
const
unsigned
int
num_threads
)
:
scheduler
::
scheduler
(
scheduler_memory
*
memory
,
const
unsigned
int
num_threads
,
bool
reuse_thread
)
:
num_threads_
{
num_threads
},
reuse_thread_
{
reuse_thread
},
memory_
{
memory
},
sync_barrier_
{
num_threads
+
1
},
sync_barrier_
{
num_threads
+
1
-
reuse_thread
},
terminated_
{
false
}
{
if
(
num_threads_
>
memory_
->
max_threads
())
{
PLS_ERROR
(
"Tried to create scheduler with more OS threads than pre-allocated memory."
);
...
...
@@ -20,8 +21,13 @@ scheduler::scheduler(scheduler_memory *memory, const unsigned int num_threads) :
for
(
unsigned
int
i
=
0
;
i
<
num_threads_
;
i
++
)
{
// Placement new is required, as the memory of `memory_` is not required to be initialized.
new
((
void
*
)
memory_
->
thread_state_for
(
i
))
thread_state
{
this
,
memory_
->
task_stack_for
(
i
),
i
};
if
(
reuse_thread
&&
i
==
0
)
{
continue
;
// Skip over first/main thread when re-using the users thread, as this one will replace the first one.
}
new
((
void
*
)
memory_
->
thread_for
(
i
))
base
::
thread
<
void
(
*
)(),
thread_state
>
(
&
scheduler
::
worker_routine
,
memory_
->
thread_state_for
(
i
));
}
}
...
...
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