From bc0bbac5859707be771b5e2ea7295c893fc2d0ff Mon Sep 17 00:00:00 2001
From: Simone Pellegrini <37897514+simpel01@users.noreply.github.com>
Date: Thu, 29 Mar 2018 11:59:28 +0200
Subject: [PATCH] Fix race condition on info.thread_id in OpenMP scheduler
 (#399)

Additionally refactor improper use of OpenMP's worksharing
construct (for).
---
 src/runtime/OMP/OMPScheduler.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/runtime/OMP/OMPScheduler.cpp b/src/runtime/OMP/OMPScheduler.cpp
index 1dd2511..d68b8af 100644
--- a/src/runtime/OMP/OMPScheduler.cpp
+++ b/src/runtime/OMP/OMPScheduler.cpp
@@ -71,15 +71,12 @@ void OMPScheduler::schedule(ICPPKernel *kernel, unsigned int split_dimension)
     }
     else
     {
-        #pragma omp parallel num_threads(info.num_threads)
+        #pragma omp parallel private(info) num_threads(info.num_threads)
         {
-            #pragma omp for
-            for(int t = 0; t < info.num_threads; ++t)
-            {
-                Window win     = max_window.split_window(split_dimension, t, info.num_threads);
-                info.thread_id = t;
-                kernel->run(win, info);
-            }
+            const int tid  = omp_get_thread_num();
+            Window win     = max_window.split_window(split_dimension, tid, info.num_threads);
+            info.thread_id = tid;
+            kernel->run(win, info);
         }
     }
 }
-- 
2.7.4