ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #6320 from thananon/pr/wait_sync_fix

Просмотр исходного кода 
opal/threads: reverted #6199
Этот коммит содержится в:
Thananon Patinyasakdikul 2019-01-30 15:31:27 -05:00 коммит произвёл GitHub
родитель 2c8f745d8d 56d3e0a43d
Коммит 58244b36d1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 20 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

47
opal/threads/wait_sync.c
Просмотреть файл

@ -47,19 +47,17 @@ int ompi_sync_wait_mt(ompi_wait_sync_t *sync)
} }
/* Insert sync on the list of pending synchronization constructs */ /* Insert sync on the list of pending synchronization constructs */
if (num_thread_in_progress >= opal_max_thread_in_progress) { OPAL_THREAD_LOCK(&wait_sync_lock);
OPAL_THREAD_LOCK(&wait_sync_lock); if( NULL == wait_sync_list ) {
if( NULL == wait_sync_list ) { sync->next = sync->prev = sync;
sync->next = sync->prev = sync; wait_sync_list = sync;
wait_sync_list = sync; } else {
} else { sync->prev = wait_sync_list->prev;
sync->prev = wait_sync_list->prev; sync->prev->next = sync;
sync->prev->next = sync; sync->next = wait_sync_list;
sync->next = wait_sync_list; wait_sync_list->prev = sync;
wait_sync_list->prev = sync;
}
OPAL_THREAD_UNLOCK(&wait_sync_lock);
} }
OPAL_THREAD_UNLOCK(&wait_sync_lock);
/** /**
* If we are not responsible for progresing, go silent until something worth noticing happen: * If we are not responsible for progresing, go silent until something worth noticing happen:
@ -91,23 +89,18 @@ int ompi_sync_wait_mt(ompi_wait_sync_t *sync)
} }
OPAL_THREAD_ADD_FETCH32(&num_thread_in_progress, -1); OPAL_THREAD_ADD_FETCH32(&num_thread_in_progress, -1);
if (NULL != wait_sync_list) {
assert(sync == wait_sync_list);
}
i_am_done: i_am_done:
/* My sync is now complete. Trim the list: remove self, wake next */ /* My sync is now complete. Trim the list: remove self, wake next */
if (num_thread_in_progress >= opal_max_thread_in_progress) { OPAL_THREAD_LOCK(&wait_sync_lock);
OPAL_THREAD_LOCK(&wait_sync_lock); sync->prev->next = sync->next;
sync->prev->next = sync->next; sync->next->prev = sync->prev;
sync->next->prev = sync->prev; /* In case I am the progress manager, pass the duties on */
/* In case I am the progress manager, pass the duties on */ if( sync == wait_sync_list ) {
if( sync == wait_sync_list ) { wait_sync_list = (sync == sync->next) ? NULL : sync->next;
wait_sync_list = (sync == sync->next) ? NULL : sync->next; if( NULL != wait_sync_list )
if( NULL != wait_sync_list ) WAIT_SYNC_PASS_OWNERSHIP(wait_sync_list);
WAIT_SYNC_PASS_OWNERSHIP(wait_sync_list);
}
OPAL_THREAD_UNLOCK(&wait_sync_lock);
} }
OPAL_THREAD_UNLOCK(&wait_sync_lock);
return (0 == sync->status) ? OPAL_SUCCESS : OPAL_ERROR; return (0 == sync->status) ? OPAL_SUCCESS : OPAL_ERROR;
} }