1
1

Fix some naming that doesn't make a ton of sense

This commit was SVN r26277.
Этот коммит содержится в:
Brian Barrett 2012-04-18 01:05:18 +00:00
родитель f4d4e87176
Коммит 8a70747da2
7 изменённых файлов: 18 добавлений и 18 удалений

Просмотреть файл

@ -157,7 +157,7 @@ ompi_mtl_portals4_finalize(struct mca_mtl_base_module_t *mtl)
PtlMEUnlink(ompi_mtl_portals4.long_overflow_me_h);
PtlMDRelease(ompi_mtl_portals4.zero_md_h);
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.read_idx);
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.send_idx);
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.recv_idx);
PtlEQFree(ompi_mtl_portals4.send_eq_h);
PtlEQFree(ompi_mtl_portals4.recv_eq_h);
PtlNIFini(ompi_mtl_portals4.ni_h);

Просмотреть файл

@ -55,7 +55,7 @@ struct mca_mtl_portals4_module_t {
ptl_handle_ni_t ni_h;
/** portals index for message matching */
ptl_pt_index_t send_idx;
ptl_pt_index_t recv_idx;
/** portals index for long message rendezvous */
ptl_pt_index_t read_idx;
/** portals index for flow control recovery */
@ -70,7 +70,7 @@ struct mca_mtl_portals4_module_t {
ptl_handle_md_t zero_md_h;
/** long message receive overflow ME. Persistent ME, first in
overflow list on the send_idx portal table. */
overflow list on the recv_idx portal table. */
ptl_handle_me_t long_overflow_me_h;
/** List of active short receive blocks. Active means that the ME
@ -103,9 +103,9 @@ typedef struct mca_mtl_portals4_module_t mca_mtl_portals4_module_t;
extern mca_mtl_portals4_module_t ompi_mtl_portals4;
#define REQ_SEND_TABLE_ID 2
#define REQ_READ_TABLE_ID 3
#define REQ_FLOWCTL_TABLE_ID 4
#define REQ_RECV_TABLE_ID 12
#define REQ_READ_TABLE_ID 13
#define REQ_FLOWCTL_TABLE_ID 14
#define MTL_PORTALS4_FLOWCTL_TRIGGER 0x01
#define MTL_PORTALS4_FLOWCTL_ALERT 0x02

Просмотреть файл

@ -159,7 +159,7 @@ ompi_mtl_portals4_component_open(void)
ompi_mtl_portals4.recv_eq_h = PTL_INVALID_HANDLE;
ompi_mtl_portals4.zero_md_h = PTL_INVALID_HANDLE;
ompi_mtl_portals4.long_overflow_me_h = PTL_INVALID_HANDLE;
ompi_mtl_portals4.send_idx = (ptl_pt_index_t) ~0UL;
ompi_mtl_portals4.recv_idx = (ptl_pt_index_t) ~0UL;
ompi_mtl_portals4.read_idx = (ptl_pt_index_t) ~0UL;
return OMPI_SUCCESS;
@ -254,8 +254,8 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
PTL_PT_ONLY_TRUNCATE |
PTL_PT_FLOWCTRL,
ompi_mtl_portals4.recv_eq_h,
REQ_SEND_TABLE_ID,
&ompi_mtl_portals4.send_idx);
REQ_RECV_TABLE_ID,
&ompi_mtl_portals4.recv_idx);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_mtl_base_output,
"%s:%d: PtlPTAlloc failed: %d\n",
@ -309,7 +309,7 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
MTL_PORTALS4_SOURCE_MASK |
MTL_PORTALS4_TAG_MASK;
ret = PtlMEAppend(ompi_mtl_portals4.ni_h,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
&me,
PTL_OVERFLOW_LIST,
NULL,
@ -374,8 +374,8 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
if (ompi_mtl_portals4.read_idx != (ptl_pt_index_t) ~0UL) {
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.read_idx);
}
if (ompi_mtl_portals4.send_idx != (ptl_pt_index_t) ~0UL) {
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.send_idx);
if (ompi_mtl_portals4.recv_idx != (ptl_pt_index_t) ~0UL) {
PtlPTFree(ompi_mtl_portals4.ni_h, ompi_mtl_portals4.recv_idx);
}
if (PTL_OK != PtlHandleIsEqual(ompi_mtl_portals4.send_eq_h, PTL_INVALID_HANDLE)) {
PtlEQFree(ompi_mtl_portals4.send_eq_h);

Просмотреть файл

@ -99,7 +99,7 @@ ompi_mtl_portals4_iprobe(struct mca_mtl_base_module_t* mtl,
opal_atomic_wmb();
ret = PtlMESearch(ompi_mtl_portals4.ni_h,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
&me,
PTL_SEARCH_ONLY,
&request);
@ -173,7 +173,7 @@ ompi_mtl_portals4_improbe(struct mca_mtl_base_module_t *mtl,
opal_atomic_wmb();
ret = PtlMESearch(ompi_mtl_portals4.ni_h,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
&me,
PTL_SEARCH_DELETE,
&request);

Просмотреть файл

@ -393,7 +393,7 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl,
me.ignore_bits = ignore_bits;
ret = PtlMEAppend(ompi_mtl_portals4.ni_h,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
&me,
PTL_PRIORITY_LIST,
ptl_request,

Просмотреть файл

@ -133,7 +133,7 @@ ompi_mtl_portals4_activate_block(ompi_mtl_portals4_recv_short_block_t *block)
me.ignore_bits = ignore_bits;
ret = PtlMEAppend(ompi_mtl_portals4.ni_h,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
&me,
PTL_OVERFLOW_LIST,
&block->request,

Просмотреть файл

@ -241,7 +241,7 @@ ompi_mtl_portals4_short_isend(mca_pml_base_send_mode_t mode,
length,
PTL_ACK_REQ,
endpoint->ptl_proc,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
match_bits,
0,
ptl_request,
@ -333,7 +333,7 @@ ompi_mtl_portals4_long_isend(void *start, int length, int contextid, int tag,
put_length,
PTL_ACK_REQ,
endpoint->ptl_proc,
ompi_mtl_portals4.send_idx,
ompi_mtl_portals4.recv_idx,
match_bits,
0,
ptl_request,