From e882f3d6f3362c0a1288e9b5d294690edf674f1c Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 9 Sep 2017 18:58:38 +0200
Subject: [PATCH] Fix thread data race in memory.c

---
 driver/others/memory.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/driver/others/memory.c b/driver/others/memory.c
index 661f7c4eb..a32d18834 100644
--- a/driver/others/memory.c
+++ b/driver/others/memory.c
@@ -1075,12 +1075,13 @@ void *blas_memory_alloc(int procpos){
 
   do {
 /*    if (!memory[position].used) { */
-
-      blas_lock(&memory[position].lock);
+      LOCK_COMMAND(&alloc_lock);
+/*      blas_lock(&memory[position].lock);*/
 
       if (!memory[position].used) goto allocation;
-
-      blas_unlock(&memory[position].lock);
+      
+      UNLOCK_COMMAND(&alloc_lock);
+/*      blas_unlock(&memory[position].lock);*/
 /*    } */
 
     position ++;
@@ -1097,7 +1098,8 @@ void *blas_memory_alloc(int procpos){
 
   memory[position].used = 1;
 
-  blas_unlock(&memory[position].lock);
+  UNLOCK_COMMAND(&alloc_lock);
+/*  blas_unlock(&memory[position].lock);*/
 
   if (!memory[position].addr) {
     do {