From f746fe152fdd53da17c4449fad2e730cc777be11 Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Wed, 22 Aug 2012 13:36:23 +0000 Subject: [PATCH] * change variable iov_len to iovec_len, in order to fix the conflict with the io vector support on Windows. * several include header protection * do not use ERROR, it's preserved for Visual Studio, use error instead. This commit was SVN r27106. --- .../mca/common/commpatterns/common_allgather.c | 18 +++++++++--------- .../mca/common/commpatterns/common_allreduce.c | 2 +- .../common_netpatterns_knomial_tree.c | 4 ++++ .../common_netpatterns_multinomial_tree.c | 4 ++++ .../netpatterns/common_netpatterns_nary_tree.c | 10 +++++++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ompi/mca/common/commpatterns/common_allgather.c b/ompi/mca/common/commpatterns/common_allgather.c index 2335f52b20..8c9ea7844e 100644 --- a/ompi/mca/common/commpatterns/common_allgather.c +++ b/ompi/mca/common/commpatterns/common_allgather.c @@ -33,7 +33,7 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, /* local variables */ int rc=OMPI_SUCCESS,msg_cnt; int pair_rank,exchange,extra_rank, n_extra_nodes,n_extra; - int proc_block,extra_start,extra_end,iov_len; + int proc_block,extra_start,extra_end,iovec_len; int remote_data_start_rank,remote_data_end_rank; int local_data_start_rank; mca_common_netpatterns_pair_exchange_node_t my_exchange_node; @@ -62,7 +62,7 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, /* place my data in the correct destination buffer */ rc=ompi_datatype_copy_content_same_ddt(dtype,count, (char *)dest_buf+my_rank_in_group*message_extent, - src_buf); + (char *)src_buf); if( OMPI_SUCCESS != rc ) { goto Error; } @@ -139,13 +139,13 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, if(pair_rank > my_rank_in_group ){ recv_iov[0].iov_base=src_buf_current+current_data_extent; recv_iov[0].iov_len=current_data_extent; - iov_len=1; + iovec_len=1; remote_data_start_rank=local_data_start_rank+proc_block; remote_data_end_rank=remote_data_start_rank+proc_block-1; } else { recv_iov[0].iov_base=src_buf_current-current_data_extent; recv_iov[0].iov_len=current_data_extent; - iov_len=1; + iovec_len=1; remote_data_start_rank=local_data_start_rank-proc_block; remote_data_end_rank=remote_data_start_rank+proc_block-1; } @@ -167,7 +167,7 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, recv_iov[1].iov_base=(char *)dest_buf+ (extra_start+my_exchange_node.n_largest_pow_2)*message_extent; recv_iov[1].iov_len=n_extra*count; - iov_len=2; + iovec_len=2; } rc=MCA_PML_CALL(irecv(recv_iov[0].iov_base, @@ -179,7 +179,7 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, } msg_cnt++; - if(iov_len > 1 ) { + if(iovec_len > 1 ) { rc=MCA_PML_CALL(irecv(recv_iov[1].iov_base, recv_iov[1].iov_len,dtype,ranks_in_comm[pair_rank], -OMPI_COMMON_TAG_ALLREDUCE, @@ -193,7 +193,7 @@ OMPI_DECLSPEC int comm_allgather_pml(void *src_buf, void *dest_buf, int count, /* post non-blocking send */ send_iov[0].iov_base=src_buf_current; send_iov[0].iov_len=current_data_extent; - iov_len=1; + iovec_len=1; /* the data from the non power of 2 ranks */ if(local_data_start_rank 1 ) { + if( iovec_len > 1 ) { rc=MCA_PML_CALL(isend(send_iov[1].iov_base, send_iov[1].iov_len,dtype,ranks_in_comm[pair_rank], -OMPI_COMMON_TAG_ALLREDUCE,MCA_PML_BASE_SEND_STANDARD, diff --git a/ompi/mca/common/commpatterns/common_allreduce.c b/ompi/mca/common/commpatterns/common_allreduce.c index e53cb91fd4..1b10b137fb 100644 --- a/ompi/mca/common/commpatterns/common_allreduce.c +++ b/ompi/mca/common/commpatterns/common_allreduce.c @@ -59,7 +59,7 @@ OMPI_DECLSPEC int comm_allreduce_pml(void *sbuf, void *rbuf, int count, if(1 == n_peers) { /* place my data in the correct destination buffer */ rc=ompi_datatype_copy_content_same_ddt(dtype,count, - rbuf, sbuf); + (char *)rbuf, (char *)sbuf); if( OMPI_SUCCESS != rc ) { goto Error; } diff --git a/ompi/mca/common/netpatterns/common_netpatterns_knomial_tree.c b/ompi/mca/common/netpatterns/common_netpatterns_knomial_tree.c index 8278bcc0f2..050e21b710 100644 --- a/ompi/mca/common/netpatterns/common_netpatterns_knomial_tree.c +++ b/ompi/mca/common/netpatterns/common_netpatterns_knomial_tree.c @@ -9,9 +9,13 @@ */ #include "ompi_config.h" +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_SYS_MMAN_H #include +#endif #include #include #include diff --git a/ompi/mca/common/netpatterns/common_netpatterns_multinomial_tree.c b/ompi/mca/common/netpatterns/common_netpatterns_multinomial_tree.c index f4b0fd0c41..28365f4037 100644 --- a/ompi/mca/common/netpatterns/common_netpatterns_multinomial_tree.c +++ b/ompi/mca/common/netpatterns/common_netpatterns_multinomial_tree.c @@ -9,9 +9,13 @@ */ #include "ompi_config.h" +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_SYS_MMAN_H #include +#endif #include #include diff --git a/ompi/mca/common/netpatterns/common_netpatterns_nary_tree.c b/ompi/mca/common/netpatterns/common_netpatterns_nary_tree.c index 4daf94f453..86275cea60 100644 --- a/ompi/mca/common/netpatterns/common_netpatterns_nary_tree.c +++ b/ompi/mca/common/netpatterns/common_netpatterns_nary_tree.c @@ -9,9 +9,13 @@ */ #include "ompi_config.h" +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_SYS_MMAN_H #include +#endif #include #include #include @@ -351,7 +355,7 @@ static int fill_in_node_data(int tree_order, int num_nodes, int my_node, { fprintf(stderr, "Cannot allocate memory for children_ranks.\n"); rc = OMPI_ERR_OUT_OF_RESOURCE; - goto ERROR; + goto error; } } } @@ -390,7 +394,7 @@ static int fill_in_node_data(int tree_order, int num_nodes, int my_node, n_ranks_to_child--; rc=fill_in_node_data(tree_order, n_ranks_to_child, rank, nodes_data); if( OMPI_SUCCESS != rc ) { - goto ERROR; + goto error; } } @@ -399,7 +403,7 @@ static int fill_in_node_data(int tree_order, int num_nodes, int my_node, return OMPI_SUCCESS; /* Error */ -ERROR: +error: return rc; }