[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-443-g3bb6c6c
Service Account
noreply at mpich.org
Tue Sep 13 09:52:08 CDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via 3bb6c6c330d92087813c55de6379d5c8b30a9075 (commit)
via 5e836456e9685b855532e5f7efdcffcd681dc6e6 (commit)
from fd6627a1bf6cdbe629defe77db231558948c48dd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/3bb6c6c330d92087813c55de6379d5c8b30a9075
commit 3bb6c6c330d92087813c55de6379d5c8b30a9075
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Fri Sep 9 11:25:23 2016 -0500
CH4/UCX: Fix bad pointer arithmetic
There were several places where we were doing arithmetic on void
pointers.
Signed-off-by: Lena Oden <loden at anl.gov>
diff --git a/src/mpid/ch4/netmod/ucx/ucx_am.h b/src/mpid/ch4/netmod/ucx/ucx_am.h
index f1700bc..d071891 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_am.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_am.h
@@ -136,7 +136,7 @@ static inline int MPIDI_NM_am_isend(int rank,
send_buf = MPL_malloc(data_sz + am_hdr_sz + sizeof(ucx_hdr));
MPIR_Memcpy(send_buf, &ucx_hdr, sizeof(ucx_hdr));
MPIR_Memcpy(send_buf + sizeof(ucx_hdr), am_hdr, am_hdr_sz);
- MPIR_Memcpy(send_buf + am_hdr_sz + sizeof(ucx_hdr), data + dt_true_lb, data_sz);
+ MPIR_Memcpy(send_buf + am_hdr_sz + sizeof(ucx_hdr), (char *) data + dt_true_lb, data_sz);
}
else {
size_t segment_first;
@@ -276,7 +276,7 @@ static inline int MPIDI_NM_am_isend_reply(MPIR_Context_id_t context_id,
send_buf = MPL_malloc(data_sz + am_hdr_sz + sizeof(ucx_hdr));
MPIR_Memcpy(send_buf, &ucx_hdr, sizeof(ucx_hdr));
MPIR_Memcpy(send_buf + sizeof(ucx_hdr), am_hdr, am_hdr_sz);
- MPIR_Memcpy(send_buf + am_hdr_sz + sizeof(ucx_hdr), data + dt_true_lb, data_sz);
+ MPIR_Memcpy(send_buf + am_hdr_sz + sizeof(ucx_hdr), (char *) data + dt_true_lb, data_sz);
ucp_request = (MPIDI_UCX_ucp_request_t *) ucp_tag_send_nb(ep, send_buf,
data_sz + am_hdr_sz +
diff --git a/src/mpid/ch4/netmod/ucx/ucx_recv.h b/src/mpid/ch4/netmod/ucx/ucx_recv.h
index d599ab1..6dd5ea6 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_recv.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_recv.h
@@ -121,7 +121,7 @@ static inline int do_irecv(void *buf,
MPIDI_Datatype_get_info(count, datatype, dt_contig, data_sz, dt_ptr, dt_true_lb);
if (dt_contig)
mpi_errno =
- ucx_irecv_continous(buf + dt_true_lb, data_sz, rank, tag, comm, context_offset,
+ ucx_irecv_continous((char *) buf + dt_true_lb, data_sz, rank, tag, comm, context_offset,
request);
else
mpi_errno =
@@ -183,7 +183,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_imrecv(void *buf,
message_handler = MPIDI_UCX_REQ(message).a.message_handler;
if (dt_contig)
ucp_request = (MPIDI_UCX_ucp_request_t *) ucp_tag_msg_recv_nb(MPIDI_UCX_global.worker,
- buf + dt_true_lb, data_sz,
+ (char *) buf + dt_true_lb, data_sz,
ucp_dt_make_contig(1),
message_handler,
&MPIDI_UCX_Handle_recv_callback);
diff --git a/src/mpid/ch4/netmod/ucx/ucx_rma.h b/src/mpid/ch4/netmod/ucx/ucx_rma.h
index 3c0046c..53aa08e 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_rma.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_rma.h
@@ -123,7 +123,7 @@ static inline int MPIDI_NM_mpi_put(const void *origin_addr,
}
- mpi_errno = MPIDI_UCX_contig_put(origin_addr + origin_true_lb, origin_bytes,
+ mpi_errno = MPIDI_UCX_contig_put((char *) origin_addr + origin_true_lb, origin_bytes,
target_rank, target_disp, target_true_lb, win);
fn_exit:
return mpi_errno;
@@ -177,7 +177,7 @@ static inline int MPIDI_NM_mpi_get(void *origin_addr,
}
- return MPIDI_UCX_contig_get(origin_addr + origin_true_lb, origin_bytes,
+ return MPIDI_UCX_contig_get((char *) origin_addr + origin_true_lb, origin_bytes,
target_rank, target_disp, target_true_lb, win);
fn_exit:
return mpi_errno;
diff --git a/src/mpid/ch4/netmod/ucx/ucx_send.h b/src/mpid/ch4/netmod/ucx/ucx_send.h
index 5400320..c90972b 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_send.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_send.h
@@ -265,7 +265,7 @@ static inline int ucx_send(const void *buf,
if (dt_contig)
mpi_errno =
- ucx_send_continous(buf + dt_true_lb, data_sz, rank, tag, comm, context_offset, request,
+ ucx_send_continous((char *) buf + dt_true_lb, data_sz, rank, tag, comm, context_offset, request,
have_request);
else
mpi_errno =
@@ -301,7 +301,7 @@ static inline int ucx_sync_send(const void *buf,
if (dt_contig)
mpi_errno =
- ucx_sync_send_continous(buf + dt_true_lb, data_sz, rank, tag, comm, context_offset,
+ ucx_sync_send_continous((char *) buf + dt_true_lb, data_sz, rank, tag, comm, context_offset,
request, have_request);
else
mpi_errno =
http://git.mpich.org/mpich.git/commitdiff/5e836456e9685b855532e5f7efdcffcd681dc6e6
commit 5e836456e9685b855532e5f7efdcffcd681dc6e6
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Fri Sep 9 11:21:06 2016 -0500
CH4/UCX: Fix unused variable warnings
Signed-off-by: Lena Oden <loden at anl.gov>
diff --git a/src/mpid/ch4/netmod/ucx/ucx_am.h b/src/mpid/ch4/netmod/ucx/ucx_am.h
index 4d1f8ec..f1700bc 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_am.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_am.h
@@ -89,7 +89,7 @@ static inline int MPIDI_NM_am_isend(int rank,
MPI_Datatype datatype, MPIR_Request * sreq,
void *netmod_context)
{
- int mpi_errno = MPI_SUCCESS, c;
+ int mpi_errno = MPI_SUCCESS;
MPIDI_UCX_ucp_request_t *ucp_request;
ucp_ep_h ep;
uint64_t ucx_tag;
@@ -246,13 +246,13 @@ static inline int MPIDI_NM_am_isend_reply(MPIR_Context_id_t context_id,
const void *data, MPI_Count count,
MPI_Datatype datatype, MPIR_Request * sreq)
{
- int mpi_errno = MPI_SUCCESS, c;
+ int mpi_errno = MPI_SUCCESS;
MPIDI_UCX_ucp_request_t *ucp_request;
ucp_ep_h ep;
uint64_t ucx_tag;
char *send_buf;
size_t data_sz;
- MPI_Aint dt_true_lb, last;
+ MPI_Aint dt_true_lb;
MPIR_Datatype *dt_ptr;
int dt_contig;
MPIDI_UCX_am_header_t ucx_hdr;
@@ -327,7 +327,7 @@ static inline int MPIDI_NM_am_send_hdr(int rank,
int handler_id,
const void *am_hdr, size_t am_hdr_sz, void *netmod_context)
{
- int mpi_errno = MPI_SUCCESS, c;
+ int mpi_errno = MPI_SUCCESS;
MPIDI_UCX_ucp_request_t *ucp_request;
ucp_ep_h ep;
uint64_t ucx_tag;
@@ -379,7 +379,7 @@ static inline int MPIDI_NM_am_send_hdr_reply(MPIR_Context_id_t context_id,
int src_rank,
int handler_id, const void *am_hdr, size_t am_hdr_sz)
{
- int mpi_errno = MPI_SUCCESS, c;
+ int mpi_errno = MPI_SUCCESS;
MPIDI_UCX_ucp_request_t *ucp_request;
ucp_ep_h ep;
uint64_t ucx_tag;
diff --git a/src/mpid/ch4/netmod/ucx/ucx_datatype.h b/src/mpid/ch4/netmod/ucx/ucx_datatype.h
index bfcd91d..c0cc42c 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_datatype.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_datatype.h
@@ -123,7 +123,6 @@ static inline int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p)
{
ucp_datatype_t ucp_datatype;
ucs_status_t status;
- size_t size;
int is_contig;
diff --git a/src/mpid/ch4/netmod/ucx/ucx_init.h b/src/mpid/ch4/netmod/ucx/ucx_init.h
index 23354ef..2e523ea 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_init.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_init.h
@@ -26,12 +26,11 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
MPIR_Comm * comm_self,
int spawned, int num_contexts, void **netmod_contexts)
{
- int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno;
+ int mpi_errno = MPI_SUCCESS, pmi_errno;
int str_errno = MPL_STR_SUCCESS;
ucp_config_t *config;
ucs_status_t ucx_status;
uint64_t features = 0;
- int status;
char valS[MPIDI_UCX_KVSAPPSTRLEN], *val;
char keyS[MPIDI_UCX_KVSAPPSTRLEN];
char remote_addr[MPIDI_UCX_KVSAPPSTRLEN];
@@ -39,9 +38,6 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
// char *table = NULL;
int i;
ucp_params_t ucp_params;
- int avtid = 0, max_n_avts;
-
- size_t address_length = 0;
MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_INIT);
MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_INIT);
@@ -129,9 +125,8 @@ static inline int MPIDI_NM_mpi_init_hook(int rank,
static inline int MPIDI_NM_mpi_finalize_hook(void)
{
- int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno;
+ int mpi_errno = MPI_SUCCESS, pmi_errno;
int i, j, max_n_avts;
- MPIR_Errflag_t errflag;
MPIR_Comm *comm;
max_n_avts = MPIDIU_get_max_n_avts();
@@ -261,7 +256,6 @@ static inline int MPIDI_NM_gpid_tolpidarray(int size, MPIR_Gpid gpid[], int lpid
for (i = 0; i < size; i++) {
int j, k;
- char tbladdr[128];
int found = 0;
for (k = 0; k < max_n_avts; k++) {
diff --git a/src/mpid/ch4/netmod/ucx/ucx_recv.h b/src/mpid/ch4/netmod/ucx/ucx_recv.h
index 4d762ad..d599ab1 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_recv.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_recv.h
@@ -114,7 +114,6 @@ static inline int do_irecv(void *buf,
int mpi_errno = MPI_SUCCESS;
size_t data_sz;
int dt_contig;
- MPIR_Request *req;
MPI_Aint dt_true_lb;
MPIR_Datatype *dt_ptr;
diff --git a/src/mpid/ch4/netmod/ucx/ucx_spawn.h b/src/mpid/ch4/netmod/ucx/ucx_spawn.h
index cdc8bae..d693edc 100644
--- a/src/mpid/ch4/netmod/ucx/ucx_spawn.h
+++ b/src/mpid/ch4/netmod/ucx/ucx_spawn.h
@@ -65,7 +65,6 @@ static inline int MPIDI_NM_mpi_comm_connect(const char *port_name,
static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr)
{
int mpi_errno = MPI_SUCCESS;
- MPIR_Errflag_t errflag = MPIR_ERR_NONE;
MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_COMM_DISCONNECT);
MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_COMM_DISCONNECT);
-----------------------------------------------------------------------
Summary of changes:
src/mpid/ch4/netmod/ucx/ucx_am.h | 14 +++++++-------
src/mpid/ch4/netmod/ucx/ucx_datatype.h | 1 -
src/mpid/ch4/netmod/ucx/ucx_init.h | 10 ++--------
src/mpid/ch4/netmod/ucx/ucx_recv.h | 5 ++---
src/mpid/ch4/netmod/ucx/ucx_rma.h | 4 ++--
src/mpid/ch4/netmod/ucx/ucx_send.h | 4 ++--
src/mpid/ch4/netmod/ucx/ucx_spawn.h | 1 -
7 files changed, 15 insertions(+), 24 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list