1
1

* fix opal_list_item_t -> ompi_free_list_item_t type change

This commit was SVN r10659.
Этот коммит содержится в:
Brian Barrett 2006-07-05 17:02:16 +00:00
родитель 23d3628691
Коммит 043153dad3
2 изменённых файлов: 7 добавлений и 8 удалений

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

@ -69,7 +69,7 @@ OBJ_CLASS_DECLARATION(mca_btl_portals_frag_recv_t);
#define OMPI_BTL_PORTALS_FRAG_ALLOC_EAGER(btl_macro, frag, rc) \
{ \
\
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_GET(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_eager, item, rc); \
if (rc == OMPI_ERR_TEMP_OUT_OF_RESOURCE) { \
OMPI_BTL_PORTALS_FRAG_ALLOC_MAX(btl_macro, frag, rc); \
@ -82,14 +82,14 @@ OBJ_CLASS_DECLARATION(mca_btl_portals_frag_recv_t);
{ \
assert(BTL_PORTALS_FRAG_TYPE_EAGER == frag->type); \
OMPI_FREE_LIST_RETURN(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_eager, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}
#define OMPI_BTL_PORTALS_FRAG_ALLOC_MAX(btl_macro, frag, rc) \
{ \
\
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_WAIT(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_max, item, rc); \
frag = (mca_btl_portals_frag_t*) item; \
}
@ -99,13 +99,13 @@ OBJ_CLASS_DECLARATION(mca_btl_portals_frag_recv_t);
{ \
assert(BTL_PORTALS_FRAG_TYPE_MAX == frag->type); \
OMPI_FREE_LIST_RETURN(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_max, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}
#define OMPI_BTL_PORTALS_FRAG_ALLOC_USER(btl_macro, frag, rc) \
{ \
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_WAIT(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_user, item, rc); \
frag = (mca_btl_portals_frag_t*) item; \
}
@ -115,7 +115,7 @@ OBJ_CLASS_DECLARATION(mca_btl_portals_frag_recv_t);
{ \
assert(BTL_PORTALS_FRAG_TYPE_USER == frag->type); \
OMPI_FREE_LIST_RETURN(&((mca_btl_portals_module_t*)btl_macro)->portals_frag_user, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}

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

@ -159,8 +159,6 @@ ompi_mtl_portals_isend(struct mca_mtl_base_module_t* mtl,
md.user_ptr = ptl_request;
md.eq_handle = ompi_mtl_portals.ptl_eq_h;
/* gets are all by unique key, so we don't really care
where in the list it goes */
ptr.pval = ptl_request;
ret = PtlMEAttach(ompi_mtl_portals.ptl_ni_h,
OMPI_MTL_PORTALS_READ_TABLE_ID,
@ -199,6 +197,7 @@ ompi_mtl_portals_isend(struct mca_mtl_base_module_t* mtl,
if (ptl_request->free_after) free(md.start);
return ompi_common_portals_error_ptl_to_ompi(ret);
}
} else if (MCA_PML_BASE_SEND_SYNCHRONOUS) {
/* short synchronous message */
PTL_SET_SEND_BITS(match_bits, comm->c_contextid,