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

* Clean up progress function

Просмотр исходного кода 
* Only print returnable errors when verbose=1.  Still print errors when
  we're going to abort, since those obviously aren't returnable

This commit was SVN r25213.
Этот коммит содержится в:
Brian Barrett 2011-09-29 22:26:33 +00:00
родитель 758f8a4d87
Коммит 14f32a1a54
5 изменённых файлов: 113 добавлений и 140 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -72,34 +72,34 @@ ompi_mtl_portals4_add_procs(struct mca_mtl_base_module_t *mtl,
size_t size;
if (procs[i]->proc_arch != ompi_proc_local()->proc_arch) {
opal_output(ompi_mtl_base_output,
"Portals 4 MTL does not support heterogeneous operations.");
opal_output(ompi_mtl_base_output,
"Proc %s architecture %x, mine %x.",
ORTE_NAME_PRINT(&procs[i]->proc_name),
procs[i]->proc_arch, ompi_proc_local()->proc_arch);
opal_output_verbose(1, ompi_mtl_base_output,
"Portals 4 MTL does not support heterogeneous operations.");
opal_output_verbose(1, ompi_mtl_base_output,
"Proc %s architecture %x, mine %x.",
ORTE_NAME_PRINT(&procs[i]->proc_name),
procs[i]->proc_arch, ompi_proc_local()->proc_arch);
return OMPI_ERR_NOT_SUPPORTED;
}
mtl_peer_data[i] = malloc(sizeof(struct mca_mtl_base_endpoint_t));
if (NULL == mtl_peer_data[i]) {
opal_output(ompi_mtl_base_output,
"%s:%d: malloc failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: malloc failed: %d\n",
__FILE__, __LINE__, ret);
return OMPI_ERR_OUT_OF_RESOURCE;
}
ret = ompi_modex_recv(&mca_mtl_portals4_component.mtl_version,
procs[i], (void**) &id, &size);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: ompi_modex_recv failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: ompi_modex_recv failed: %d\n",
__FILE__, __LINE__, ret);
return ret;
} else if (sizeof(ptl_process_t) != size) {
opal_output(ompi_mtl_base_output,
"%s:%d: ompi_modex_recv failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: ompi_modex_recv failed: %d\n",
__FILE__, __LINE__, ret);
return OMPI_ERR_BAD_PARAM;
}
@ -174,47 +174,10 @@ ompi_mtl_portals4_progress(void)
case PTL_EVENT_PUT_OVERFLOW:
case PTL_EVENT_ATOMIC:
case PTL_EVENT_ATOMIC_OVERFLOW:
if (NULL != ev.user_ptr) {
ptl_request = ev.user_ptr;
ret = ptl_request->event_callback(&ev, ptl_request);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"Error returned from target event callback: %d", ret);
abort();
}
}
break;
case PTL_EVENT_REPLY:
case PTL_EVENT_SEND:
case PTL_EVENT_ACK:
if (NULL != ev.user_ptr) {
ptl_request = ev.user_ptr;
ret = ptl_request->event_callback(&ev, ptl_request);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"Error returned from initiator event callback: %d", ret);
abort();
}
}
break;
case PTL_EVENT_PT_DISABLED:
/* do stuff - flow control */
opal_output(ompi_mtl_base_output, "Unhandled send flow control event.");
abort();
break;
case PTL_EVENT_AUTO_UNLINK:
break;
case PTL_EVENT_AUTO_FREE:
if (NULL != ev.user_ptr) {
ptl_request = ev.user_ptr;
ret = ptl_request->event_callback(&ev, ptl_request);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"Error returned from auto_free event callback: %d", ret);
abort();
}
}
break;
case PTL_EVENT_SEARCH:
if (NULL != ev.user_ptr) {
ptl_request = ev.user_ptr;
@ -226,10 +189,20 @@ ompi_mtl_portals4_progress(void)
}
}
break;
default:
opal_output(ompi_mtl_base_output,
"Unknown event type %d (error: %d)", (int)ev.type, ret);
case PTL_EVENT_PT_DISABLED:
/* BWB: FIX ME: do stuff - flow control */
opal_output(ompi_mtl_base_output, "Unhandled send flow control event.");
abort();
break;
case PTL_EVENT_AUTO_UNLINK:
opal_output_verbose(1, ompi_mtl_base_output,
"Unexpected auto unlink event");
break;
case PTL_EVENT_GET_OVERFLOW:
case PTL_EVENT_FETCH_ATOMIC:
case PTL_EVENT_FETCH_ATOMIC_OVERFLOW:
opal_output_verbose(1, ompi_mtl_base_output,
"Unexpected event of type %d", ev.type);
}
} else if (PTL_EQ_EMPTY == ret) {
break;

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

@ -163,9 +163,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
/* Initialize Portals and create a physical, matching interface */
ret = PtlInit();
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlInit failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlInit failed: %d\n",
__FILE__, __LINE__, ret);
return NULL;
}
@ -176,27 +176,27 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
NULL,
&ompi_mtl_portals4.ni_h);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlNIInit failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlNIInit failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
/* Publish our NID/PID in the modex */
ret = PtlGetId(ompi_mtl_portals4.ni_h, &id);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlGetId failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlGetId failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
ret = ompi_modex_send(&mca_mtl_portals4_component.mtl_version,
&id, sizeof(id));
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: ompi_modex_send failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: ompi_modex_send failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
@ -209,9 +209,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
ompi_mtl_portals4.queue_size,
&ompi_mtl_portals4.eq_h);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlEQAlloc failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlEQAlloc failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
@ -222,9 +222,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
REQ_SEND_TABLE_ID,
&ompi_mtl_portals4.send_idx);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlPTAlloc failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlPTAlloc failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
ret = PtlPTAlloc(ompi_mtl_portals4.ni_h,
@ -233,9 +233,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
REQ_READ_TABLE_ID,
&ompi_mtl_portals4.read_idx);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlPTAlloc failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlPTAlloc failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
@ -250,9 +250,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
&md,
&ompi_mtl_portals4.zero_md_h );
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
@ -274,18 +274,18 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
NULL,
&ompi_mtl_portals4.long_overflow_me_h);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
/* attach short unex recv blocks */
ret = ompi_mtl_portals4_recv_short_init(&ompi_mtl_portals4);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: short receive block initialization failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: short receive block initialization failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}
@ -297,9 +297,9 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
/* activate progress callback */
ret = opal_progress_register(ompi_mtl_portals4_progress);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: opal_progress_register failed: %d\n",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: opal_progress_register failed: %d\n",
__FILE__, __LINE__, ret);
goto error;
}

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

@ -95,9 +95,9 @@ ompi_mtl_portals4_iprobe(struct mca_mtl_base_module_t* mtl,
PTL_SEARCH_ONLY,
&request);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMESearch failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMESearch failed: %d",
__FILE__, __LINE__, ret);
return ompi_mtl_portals4_get_error(ret);
}

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

@ -48,9 +48,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->opcount, ev->hdr_data));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(ompi_mtl_base_output,
"%s:%d: PTL_EVENT_PUT with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PTL_EVENT_PUT with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
goto callback_error;
}
@ -60,8 +60,8 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->super.super.ompi_req->req_status.MPI_TAG =
MTL_PORTALS4_GET_TAG(ev->match_bits);
if (msg_length > ptl_request->delivery_len) {
opal_output(ompi_mtl_base_output, "truncate expected: %ld %ld",
msg_length, ptl_request->delivery_len);
opal_output_verbose(1, ompi_mtl_base_output, "truncate expected: %ld %ld",
msg_length, ptl_request->delivery_len);
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = MPI_ERR_TRUNCATE;
}
@ -84,9 +84,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
&ptl_request->md_h);
if (PTL_OK != ret) {
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d",
__FILE__, __LINE__, ret);
goto callback_error;
}
@ -99,9 +99,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ompi_mtl_portals4.eager_limit,
ptl_request);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlGet failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlGet failed: %d",
__FILE__, __LINE__, ret);
PtlMDRelease(ptl_request->md_h);
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
goto callback_error;
@ -113,9 +113,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ev->start,
ev->mlength);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: ompi_mtl_datatype_unpack failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: ompi_mtl_datatype_unpack failed: %d",
__FILE__, __LINE__, ret);
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = ret;
}
ptl_request->super.super.ompi_req->req_status._ucount = ev->mlength;
@ -131,9 +131,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->opcount, ptl_request->hdr_data));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(ompi_mtl_base_output,
"%s:%d: PTL_EVENT_REPLY with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PTL_EVENT_REPLY with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
PtlMDRelease(ptl_request->md_h);
goto callback_error;
}
@ -154,9 +154,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->delivery_ptr,
ptl_request->super.super.ompi_req->req_status._ucount);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: ompi_mtl_datatype_unpack failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: ompi_mtl_datatype_unpack failed: %d",
__FILE__, __LINE__, ret);
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = ret;
}
PtlMDRelease(ptl_request->md_h);
@ -171,9 +171,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->opcount, ev->hdr_data));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(ompi_mtl_base_output,
"%s:%d: PTL_EVENT_PUT_OVERFLOW with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PTL_EVENT_PUT_OVERFLOW with ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
goto callback_error;
}
@ -183,8 +183,8 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->super.super.ompi_req->req_status.MPI_TAG =
MTL_PORTALS4_GET_TAG(ev->match_bits);
if (msg_length > ptl_request->delivery_len) {
opal_output(ompi_mtl_base_output, "truncate unexpected: %ld %ld %d",
msg_length, ptl_request->delivery_len, MTL_PORTALS4_IS_SHORT_MSG(ev->match_bits));
opal_output_verbose(1, ompi_mtl_base_output, "truncate unexpected: %ld %ld %d",
msg_length, ptl_request->delivery_len, MTL_PORTALS4_IS_SHORT_MSG(ev->match_bits));
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = MPI_ERR_TRUNCATE;
}
@ -209,9 +209,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
&max_data );
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
if (ret < 0) {
opal_output(ompi_mtl_base_output,
"%s:%d: opal_convertor_unpack failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: opal_convertor_unpack failed: %d",
__FILE__, __LINE__, ret);
goto callback_error;
}
}
@ -230,9 +230,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
NULL,
0);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlPut failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlPut failed: %d",
__FILE__, __LINE__, ret);
goto callback_error;
}
}
@ -261,9 +261,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
&ptl_request->md_h);
if (PTL_OK != ret) {
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMDBind failed: %d",
__FILE__, __LINE__, ret);
goto callback_error;
}
@ -278,9 +278,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ev->mlength,
ptl_request);
if (PTL_OK != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlGet failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlGet failed: %d",
__FILE__, __LINE__, ret);
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
PtlMDRelease(ptl_request->md_h);
goto callback_error;
@ -290,9 +290,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
break;
default:
opal_output(ompi_mtl_base_output,
"Unhandled receive callback with event type %d",
ev->type);
opal_output_verbose(1, ompi_mtl_base_output,
"Unhandled receive callback with event type %d",
ev->type);
return OMPI_ERROR;
}
@ -339,9 +339,9 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl,
ret = ompi_mtl_datatype_recv_buf(convertor, &start, &length, &free_after);
if (OMPI_SUCCESS != ret) {
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d",
__FILE__, __LINE__, ret);
return ret;
}
@ -380,9 +380,9 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl,
&ptl_request->me_h);
if (PTL_OK != ret) {
if (NULL != ptl_request->buffer_ptr) free(ptl_request->buffer_ptr);
opal_output(ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d",
__FILE__, __LINE__, ret);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlMEAppend failed: %d",
__FILE__, __LINE__, ret);
return ompi_mtl_portals4_get_error(ret);
}

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

@ -39,9 +39,9 @@ ompi_mtl_portals4_send_callback(ptl_event_t *ev, struct ompi_mtl_portals4_base_r
assert(NULL != ptl_request->super.super.ompi_req);
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(ompi_mtl_base_output,
"%s:%d: send callback ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: send callback ni_fail_type: %d",
__FILE__, __LINE__, ev->ni_fail_type);
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = OMPI_ERROR;
ptl_request->super.super.completion_callback(&ptl_request->super.super);
abort();