Fix logic in determining whether all modules support multiple user
threads or not. This commit was SVN r1361.
Этот коммит содержится в:
родитель
a5b3478c88
Коммит
e88c37e1f8
@ -43,13 +43,13 @@ int mca_base_init_select_modules(int requested,
|
||||
&user_threads, &hidden_threads)) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
allow_multi_user_threads |= user_threads;
|
||||
allow_multi_user_threads &= user_threads;
|
||||
have_hidden_threads |= hidden_threads;
|
||||
|
||||
if (OMPI_SUCCESS != mca_ptl_base_select(&user_threads, &hidden_threads)) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
allow_multi_user_threads |= user_threads;
|
||||
allow_multi_user_threads &= user_threads;
|
||||
have_hidden_threads |= hidden_threads;
|
||||
|
||||
OBJ_CONSTRUCT(&colls, ompi_list_t);
|
||||
@ -57,7 +57,7 @@ int mca_base_init_select_modules(int requested,
|
||||
&hidden_threads)) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
allow_multi_user_threads |= user_threads;
|
||||
allow_multi_user_threads &= user_threads;
|
||||
have_hidden_threads |= hidden_threads;
|
||||
|
||||
/* Now that we have a final list of all available modules, do the
|
||||
|
@ -66,7 +66,7 @@ int mca_mpool_base_init(bool *allow_multi_user_threads)
|
||||
/* Otherwise, it initialized properly. Save it. */
|
||||
|
||||
else {
|
||||
*allow_multi_user_threads |= user_threads;
|
||||
*allow_multi_user_threads &= user_threads;
|
||||
|
||||
ompi_output_verbose(10, mca_mpool_base_output,
|
||||
"select: init returned success");
|
||||
|
@ -65,7 +65,7 @@ int mca_ptl_base_select(bool *allow_multi_user_threads,
|
||||
/* Otherwise, it initialized properly. Save it. */
|
||||
|
||||
else {
|
||||
*allow_multi_user_threads |= user_threads;
|
||||
*allow_multi_user_threads &= user_threads;
|
||||
*have_hidden_threads |= hidden_threads;
|
||||
|
||||
ompi_output_verbose(10, mca_ptl_base_output,
|
||||
|
@ -27,7 +27,7 @@ int ompi_rte_init(bool *allow_multi_user_threads, bool *have_hidden_threads)
|
||||
int ret;
|
||||
bool user_threads, hidden_threads;
|
||||
|
||||
*allow_multi_user_threads = false;
|
||||
*allow_multi_user_threads = true;
|
||||
*have_hidden_threads = false;
|
||||
|
||||
/* Added by JMS -- feel free to move around */
|
||||
@ -41,7 +41,7 @@ int ompi_rte_init(bool *allow_multi_user_threads, bool *have_hidden_threads)
|
||||
/* JMS show_help */
|
||||
return ret;
|
||||
}
|
||||
*allow_multi_user_threads |= user_threads;
|
||||
*allow_multi_user_threads &= user_threads;
|
||||
*have_hidden_threads |= hidden_threads;
|
||||
|
||||
if (OMPI_SUCCESS != (ret = mca_oob_base_open())) {
|
||||
@ -53,7 +53,7 @@ int ompi_rte_init(bool *allow_multi_user_threads, bool *have_hidden_threads)
|
||||
/* JMS show_help */
|
||||
return ret;
|
||||
}
|
||||
*allow_multi_user_threads |= user_threads;
|
||||
*allow_multi_user_threads &= user_threads;
|
||||
*have_hidden_threads |= hidden_threads;
|
||||
|
||||
#if 0
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user