From 2e6fae2aad240fe6be8273cc53bc239ee920ee7c Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 19 Nov 2018 14:02:50 +0100
Subject: [PATCH 1/3] Serialize accesses to parallelized level3 functions from
 multiple callers

for #1851
---
 driver/level3/level3_thread.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c
index aeb5e6ed4..15cad9274 100644
--- a/driver/level3/level3_thread.c
+++ b/driver/level3/level3_thread.c
@@ -514,6 +514,10 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
 		       *range_n, FLOAT *sa, FLOAT *sb,
                        BLASLONG nthreads_m, BLASLONG nthreads_n) {
 
+#ifndef USE_OPENMP
+static pthread_mutex_t  level3_lock    = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
   blas_arg_t newarg;
 
 #ifndef USE_ALLOC_HEAP
@@ -554,6 +558,10 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
 #endif
 #endif
 
+#ifndef USE_OPENMP
+pthread_mutex_lock(&level3_lock);
+#endif
+
 #ifdef USE_ALLOC_HEAP
   /* Dynamically allocate workspace */
   job = (job_t*)malloc(MAX_CPU_NUMBER * sizeof(job_t));
@@ -671,6 +679,10 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
   free(job);
 #endif
 
+#ifndef USE_OPENMP
+  pthread_mutex_unlock(&level3_lock);
+#endif
+
   return 0;
 }
 

From 5192651706d39b35e82b6f62f2b02764cdb3983c Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 19 Nov 2018 17:58:22 +0100
Subject: [PATCH 2/3] Add CriticalSection handling instead of mutexes for
 Windows

---
 driver/level3/level3_thread.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c
index 15cad9274..ac96f9424 100644
--- a/driver/level3/level3_thread.c
+++ b/driver/level3/level3_thread.c
@@ -515,7 +515,12 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
                        BLASLONG nthreads_m, BLASLONG nthreads_n) {
 
 #ifndef USE_OPENMP
+#ifndef OS_WINDOWS
 static pthread_mutex_t  level3_lock    = PTHREAD_MUTEX_INITIALIZER;
+#else
+CRITICAL_SECTION level3_lock;
+InitializeCriticalSection((PCRITICAL_SECTION)&level3_lock;
+#endif
 #endif
 
   blas_arg_t newarg;
@@ -559,7 +564,11 @@ static pthread_mutex_t  level3_lock    = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
 #ifndef USE_OPENMP
+#ifndef OS_WINDOWS
 pthread_mutex_lock(&level3_lock);
+#else
+EnterCriticalSection((PCRITICAL_SECTION)&level3_lock);
+#endif
 #endif
 
 #ifdef USE_ALLOC_HEAP
@@ -680,7 +689,11 @@ pthread_mutex_lock(&level3_lock);
 #endif
 
 #ifndef USE_OPENMP
+#ifndef OS_WINDOWS
   pthread_mutex_unlock(&level3_lock);
+#else
+  LeaveCriticalSection((PCRITICAL_SECTION)&level3_lock);
+#endif
 #endif
 
   return 0;

From 113cb00b95626d037647107aaa1f00027772b0da Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 19 Nov 2018 21:01:36 +0100
Subject: [PATCH 3/3] fix missing parenthesis

---
 driver/level3/level3_thread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c
index ac96f9424..3411a3e9b 100644
--- a/driver/level3/level3_thread.c
+++ b/driver/level3/level3_thread.c
@@ -519,7 +519,7 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
 static pthread_mutex_t  level3_lock    = PTHREAD_MUTEX_INITIALIZER;
 #else
 CRITICAL_SECTION level3_lock;
-InitializeCriticalSection((PCRITICAL_SECTION)&level3_lock;
+InitializeCriticalSection((PCRITICAL_SECTION)&level3_lock);
 #endif
 #endif