From b6438dedea99647fa479f67766ea8a2c788b17f9 Mon Sep 17 00:00:00 2001
From: Ton van den Heuvel <tonvandenheuvel@gmail.com>
Date: Wed, 18 Mar 2015 13:22:43 +0100
Subject: [PATCH] Fix issue #508

Fix race condition during shutdown causing a crash in
gotoblas_set_affinity().
---
 CONTRIBUTORS.md        | 3 +++
 driver/others/memory.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 152ec95aa..b88e3671b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -124,5 +124,8 @@ In chronological order:
 * Dan Kortschak
   * [2015-01-07] Added test for drotmg bug #484.
 
+* Ton van den Heuvel <https://github.com/ton>
+  * [2015-03-18] Fix race condition during shutdown causing a crash in gotoblas_set_affinity().
+
 * [Your name or handle] <[email or website]>
   * [Date] [Brief summary of your changes]
diff --git a/driver/others/memory.c b/driver/others/memory.c
index 031615576..4010ec974 100644
--- a/driver/others/memory.c
+++ b/driver/others/memory.c
@@ -1353,6 +1353,8 @@ void DESTRUCTOR gotoblas_quit(void) {
 
   if (gotoblas_initialized == 0) return;
 
+  blas_shutdown();
+
 #ifdef PROFILE
    moncontrol (0);
 #endif
@@ -1374,8 +1376,6 @@ void DESTRUCTOR gotoblas_quit(void) {
 #ifdef PROFILE
    moncontrol (1);
 #endif
-
-   blas_shutdown();
 }
 
 #if (defined(C_PGI) || (!defined(C_SUN) && defined(F_INTERFACE_SUN))) && (defined(ARCH_X86) || defined(ARCH_X86_64))