floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1299 from martin-frbg/race_fixes 

Fix thread data races uncovered by gcc thread sanitizer
This commit is contained in:
Martin Kroeker 2017-09-09 23:41:53 +02:00 committed by GitHub
parent 00740c0e34 ba1f91f17b
commit f66d908282
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
driver/others/blas_server.c
View File

@ -669,9 +669,15 @@ int exec_blas_async(BLASLONG pos, blas_queue_t *queue){
} while (1);
} else {
while(thread_status[i].queue) {
pthread_mutex_lock (&thread_status[i].lock);
tsiq = thread_status[i].queue;
pthread_mutex_unlock (&thread_status[i].lock);
while(tsiq) {
i ++;
if (i >= blas_num_threads - 1) i = 0;
pthread_mutex_lock (&thread_status[i].lock);
tsiq = thread_status[i].queue;
pthread_mutex_unlock (&thread_status[i].lock);
}
}
#else
@ -960,14 +966,10 @@ int BLASFUNC(blas_thread_shutdown)(void){
for (i = 0; i < blas_num_threads - 1; i++) {
blas_lock(&exec_queue_lock);
pthread_mutex_lock (&thread_status[i].lock);
thread_status[i].queue = (blas_queue_t *)-1;
blas_unlock(&exec_queue_lock);
pthread_mutex_lock (&thread_status[i].lock);
thread_status[i].status = THREAD_STATUS_WAKEUP;
pthread_cond_signal (&thread_status[i].wakeup);

19
driver/others/memory.c
View File

@ -1056,12 +1056,13 @@ void *blas_memory_alloc(int procpos){
do {
if (!memory[position].used && (memory[position].pos == mypos)) {
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 ++;
@ -1075,12 +1076,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 +1099,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 {