Merge pull request #1942 from martin-frbg/issue1720

martin-frbg · web-flow · commit ccd5945d382e · 2018-12-30T14:47:05.000+01:00
Delete the pthread key on cleanup in TLS mode
diff --git a/driver/others/memory.c b/driver/others/memory.c
@@ -1073,6 +1073,11 @@ static volatile int memory_initialized = 0;
     }
     free(table);
   }
+#if defined(OS_WINDOWS)
+  TlsFree(local_storage_key);
+#else
+  pthread_key_delete(local_storage_key);
+#endif		
 }
 
 static void blas_memory_init(){

Original file line number	Diff line number	Diff line change
`@@ -1073,6 +1073,11 @@ static volatile int memory_initialized = 0;`
`1073`	`1073`	`}`
`1074`	`1074`	`free(table);`
`1075`	`1075`	`}`
	`1076`	`+#if defined(OS_WINDOWS)`
	`1077`	`+ TlsFree(local_storage_key);`
	`1078`	`+#else`
	`1079`	`+ pthread_key_delete(local_storage_key);`
	`1080`	`+#endif`
`1076`	`1081`	`}`
`1077`	`1082`
`1078`	`1083`	`static void blas_memory_init(){`