1
1

Fix compilation with GM version smaller than 2.0. Fix compilation warnings.

This commit was SVN r12386.
Этот коммит содержится в:
Gleb Natapov 2006-11-01 10:26:15 +00:00
родитель aac695a51f
Коммит b5714d698a
3 изменённых файлов: 12 добавлений и 6 удалений

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

@ -515,7 +515,9 @@ static void mca_btl_gm_send_callback( struct gm_port* port, void* context, gm_st
switch(status) {
case GM_TRY_AGAIN:
case GM_SEND_TIMED_OUT:
#if GM_API_VERSION > 0x200
case GM_TIMED_OUT:
#endif
/* drop all sends to this destination port */
gm_drop_sends(
btl->port,
@ -700,7 +702,9 @@ static void mca_btl_gm_put_callback( struct gm_port* port, void* context, gm_sta
switch(status) {
case GM_TRY_AGAIN:
case GM_SEND_TIMED_OUT:
#if GM_API_VERSION > 0x200
case GM_TIMED_OUT:
#endif
/* drop all sends to this destination port */
gm_drop_sends(
@ -846,7 +850,9 @@ static void mca_btl_gm_get_callback( struct gm_port* port, void* context, gm_sta
switch(status) {
case GM_TRY_AGAIN:
case GM_SEND_TIMED_OUT:
#if GM_API_VERSION > 0x200
case GM_TIMED_OUT:
#endif
/* drop all sends to this destination port */
gm_drop_sends(
btl->port,

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

@ -99,7 +99,7 @@ OBJ_CLASS_DECLARATION(mca_btl_gm_frag_user_t);
#define MCA_BTL_GM_FRAG_RETURN(btl, frag) \
do { \
ompi_free_list_t* mylist; \
ompi_free_list_t* mylist = NULL; \
mca_btl_gm_module_t* btl_gm = (mca_btl_gm_module_t*) btl; \
mca_btl_gm_frag_t* frag_gm = (mca_btl_gm_frag_t*) frag; \
switch(frag_gm->type) { \

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

@ -191,11 +191,11 @@ int mca_btl_gm_proc_insert(
gm_endpoint->endpoint_addr.node_id);
}
#else
gm_endpoint->gm_addr.node_id = gm_host_name_to_node_id( gm_btl->gm_port,
gm_endpoint->gm_addr.global_id);
if( GM_NO_SUCH_NODE_ID == gm_endpoint->gm_addr.node_id ) {
ompi_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id",
__FILE__, __LINE__, gm_endpoint->gm_addr.global_id);
gm_endpoint->endpoint_addr.node_id = gm_host_name_to_node_id( gm_btl->port,
gm_endpoint->endpoint_addr.global_id);
if( GM_NO_SUCH_NODE_ID == gm_endpoint->endpoint_addr.node_id ) {
opal_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id",
__FILE__, __LINE__, gm_endpoint->endpoint_addr.global_id);
return OMPI_ERROR;
}
#endif /* GM_API_VERSION > 0x200 */