Rework lock-free-work-stealing-deque to be simpler and fit 'classic' approach.

25d18c11 · FritzFlorian · bd826491 · 25d18c11 · 25d18c11 · 25d18c11
Commit 25d18c11 authored 6 years ago by FritzFlorian
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 5 deletions

app/invoke_parallel/main.cpp
+0 -1

lib/pls/include/pls/internal/data_structures/work_stealing_deque.h
+0 -0

lib/pls/src/internal/scheduling/fork_join_task.cpp
+1 -4

No files found.
--- a/app/invoke_parallel/main.cpp
+++ b/app/invoke_parallel/main.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 static constexpr int CUTOFF = 16;
-static constexpr int NUM_ITERATIONS = 1000;
 static constexpr int INPUT_SIZE = 2064;
 typedef std::vector<std::complex<double>> complex_vector;

--- a/lib/pls/include/pls/internal/data_structures/work_stealing_deque.h
+++ b/lib/pls/include/pls/internal/data_structures/work_stealing_deque.h
--- a/lib/pls/src/internal/scheduling/fork_join_task.cpp
+++ b/lib/pls/src/internal/scheduling/fork_join_task.cpp
@@ -23,7 +23,6 @@ void fork_join_sub_task::execute() {
  PROFILE_WORK_BLOCK("execute sub_task")
  tbb_task_->currently_executing_ = this;
  if (executed) {
-    int my_id = base::this_thread::state<thread_state>()->id_;
    PLS_ERROR("Double Execution!")
  }
  executed = true;
@@ -64,9 +63,7 @@ fork_join_sub_task *fork_join_task::get_local_sub_task() {
 }
 fork_join_sub_task *fork_join_task::get_stolen_sub_task() {
-  auto tmp = deque_.save_state();
+  return deque_.pop_head();
-  auto result = deque_.pop_head();
-  return result;
 }
 bool fork_join_task::internal_stealing(abstract_task *other_task) {