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

mtl-portals4: replace abort() with ompi_rte_abort()

Просмотр исходного кода 
coll-portals4: replace abort() with ompi_rte_abort()

Signed-off-by: Todd Kordenbrock <thkgcode@gmail.com>
(cherry picked from commit 04b94637dd2c5e05edf0917d02b9d1e48316d063)
Этот коммит содержится в:
Todd Kordenbrock 2020-06-24 11:05:39 -05:00
родитель 220f9ed99f
Коммит 20f9ed98f2
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ompi/mca/coll/portals4/coll_portals4_component.c
Просмотреть файл

@ -754,7 +754,7 @@ portals4_progress(void)
} }
else if (PTL_EQ_DROPPED == ret) { else if (PTL_EQ_DROPPED == ret) {
opal_output(ompi_coll_base_framework.framework_output, "Flow control situation without recovery (EQ_DROPPED)\n"); opal_output(ompi_coll_base_framework.framework_output, "Flow control situation without recovery (EQ_DROPPED)\n");
abort(); ompi_rte_abort(ret, "coll-portals4: Flow control situation without recovery (EQ_DROPPED)");
} }
else { else {
opal_output(ompi_coll_base_framework.framework_output, "Error returned from PtlEQGet: %d", ret); opal_output(ompi_coll_base_framework.framework_output, "Error returned from PtlEQGet: %d", ret);

10
ompi/mca/mtl/portals4/mtl_portals4_component.c
Просмотреть файл

@ -523,7 +523,7 @@ ompi_mtl_portals4_progress(void)
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_framework.framework_output, opal_output(ompi_mtl_base_framework.framework_output,
"Error returned from target event callback: %d", ret); "Error returned from target event callback: %d", ret);
abort(); ompi_rte_abort(ret, "mtl-portals4: Error returned from target event callback");
} }
} }
break; break;
@ -535,7 +535,7 @@ ompi_mtl_portals4_progress(void)
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_framework.framework_output, opal_output(ompi_mtl_base_framework.framework_output,
"Error returned from target event callback: %d", ret); "Error returned from target event callback: %d", ret);
abort(); ompi_rte_abort(ret, "mtl-portals4: Error returned from target event callback");
} }
} }
break; break;
@ -550,12 +550,12 @@ ompi_mtl_portals4_progress(void)
opal_output_verbose(1, ompi_mtl_base_framework.framework_output, opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"%s:%d: flowctl_trigger() failed: %d\n", "%s:%d: flowctl_trigger() failed: %d\n",
__FILE__, __LINE__, ret); __FILE__, __LINE__, ret);
abort(); ompi_rte_abort(ret, "mtl-portals4: Flow control failed (PT_DISABLED)");
} }
#else #else
opal_output(ompi_mtl_base_framework.framework_output, opal_output(ompi_mtl_base_framework.framework_output,
"Flow control situation without recovery (PT_DISABLED)"); "Flow control situation without recovery (PT_DISABLED)");
abort(); ompi_rte_abort(ret, "mtl-portals4: Flow control situation without recovery (PT_DISABLED)");
#endif #endif
break; break;
@ -573,7 +573,7 @@ ompi_mtl_portals4_progress(void)
opal_output(ompi_mtl_base_framework.framework_output, opal_output(ompi_mtl_base_framework.framework_output,
"Flow control situation without recovery (EQ_DROPPED): %d", "Flow control situation without recovery (EQ_DROPPED): %d",
which); which);
abort(); ompi_rte_abort(ret, "mtl-portals4: Flow control situation without recovery (EQ_DROPPED)");
} else { } else {
opal_output(ompi_mtl_base_framework.framework_output, opal_output(ompi_mtl_base_framework.framework_output,
"Error returned from PtlEQGet: %d", ret); "Error returned from PtlEQGet: %d", ret);