[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-252-ga803acf
mysql vizuser
noreply at mpich.org
Wed May 29 11:13:40 CDT 2013
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 a803acf6b206d59d09229605324f10b964f98e8f (commit)
via cabd1a06512932ffbbe8c307b0bfa537aba9a118 (commit)
from 670a216ebb3cd3e376ef7bc019ece16a6be2c282 (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/a803acf6b206d59d09229605324f10b964f98e8f
commit a803acf6b206d59d09229605324f10b964f98e8f
Author: Jeff Hammond <jhammond at alcf.anl.gov>
Date: Sat May 18 20:30:30 2013 -0500
Replace bzero with memset.
Replace all instances of bzero(x,n) with memset(x,0,n) per the
recommendation of
http://pubs.opengroup.org/onlinepubs/009696899/functions/bzero.html
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c b/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
index 807337e..c052c83 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
@@ -191,7 +191,7 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code)
}
/* create PanFS object */
- bzero(&file_create_args,sizeof(pan_fs_client_layout_create_args_t));
+ memset(&file_create_args,0,sizeof(pan_fs_client_layout_create_args_t));
/* open directory */
fd_dir = open(path, O_RDONLY);
if (fd_dir < 0) {
@@ -285,7 +285,7 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code)
int rc;
char temp_buffer[TEMP_BUFFER_SIZE];
pan_fs_client_layout_query_args_t file_query_args;
- bzero(&file_query_args,sizeof(pan_fs_client_layout_query_args_t));
+ memset(&file_query_args,0,sizeof(pan_fs_client_layout_query_args_t));
file_query_args.version = PAN_FS_CLIENT_LAYOUT_VERSION;
rc = ioctl(fd->fd_sys, PAN_FS_CLIENT_LAYOUT_QUERY_FILE, &file_query_args);
if (rc < 0)
diff --git a/src/mpid/pamid/include/mpidi_trace.h b/src/mpid/pamid/include/mpidi_trace.h
index 143cae3..9f04067 100644
--- a/src/mpid/pamid/include/mpidi_trace.h
+++ b/src/mpid/pamid/include/mpidi_trace.h
@@ -112,7 +112,7 @@ typedef struct {
MPIDI_Trace_buf[src].totPR++ ; \
seqNo=MPIDI_Trace_buf[src].totPR; \
idx = (seqNo & SEQMASK); \
- bzero(&MPIDI_Trace_buf[src].PR[idx],sizeof(posted_recv)); \
+ memset(&MPIDI_Trace_buf[src].PR[idx],0,sizeof(posted_recv)); \
MPIDI_Trace_buf[src].PR[idx].src_task= pami_id; \
MPIDI_Trace_buf[src].PR[idx].rank = rank; \
MPIDI_Trace_buf[src].PR[idx].bufadd = buf; \
@@ -132,7 +132,7 @@ typedef struct {
int dest=sreq->mpid.partner_id; \
int seqNo=sreq->mpid.envelope.msginfo.MPIseqno; \
int idx = (seqNo & SEQMASK); \
- bzero(&MPIDI_Trace_buf[dest].S[idx],sizeof(send_status));\
+ memset(&MPIDI_Trace_buf[dest].S[idx],0,sizeof(send_status));\
sstatus=&MPIDI_Trace_buf[dest].S[idx]; \
sstatus->req = (void *)sreq; \
sstatus->tag = sreq->mpid.envelope.msginfo.MPItag; \
diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
index 4351ae9..669158a 100644
--- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
+++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
@@ -58,7 +58,7 @@ void MPIDI_send_AM_to_remote_leader_on_disconnect(int taskid, long long comm_cnt
AM_data.tranid = comm_cntr;
AM_data.whichAM = whichAM;
- bzero(&xferP, sizeof(pami_send_immediate_t));
+ memset(&xferP, 0, sizeof(pami_send_immediate_t));
xferP.header.iov_base = (void*)&AM_data;
xferP.header.iov_len = sizeof(AM_struct2);
xferP.dispatch = (size_t)MPIDI_Protocols_Dyntask_disconnect;
diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c
index a90e24e..13038c1 100644
--- a/src/mpid/pamid/src/dyntask/mpidi_port.c
+++ b/src/mpid/pamid/src/dyntask/mpidi_port.c
@@ -184,7 +184,7 @@ int MPIDU_send_AM_to_leader(MPID_VCR new_vcr, int port_name_tag, pami_task_t tas
TRACE_ERR("send - %p %d %p %d\n", AM_data.vcr, AM_data.port_name_tag, AM_data.vcr, AM_data.vcr->taskid);
- bzero(&xferP, sizeof(pami_send_t));
+ memset(&xferP, 0, sizeof(pami_send_t));
xferP.send.header.iov_base = (void*)&AM_data;
xferP.send.header.iov_len = sizeof(AM_struct);
xferP.send.dispatch = MPIDI_Protocols_Dyntask;
diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c
index 3fb57bb..2db821d 100644
--- a/src/mpid/pamid/src/mpid_init.c
+++ b/src/mpid/pamid/src/mpid_init.c
@@ -1364,7 +1364,7 @@ int MPIDI_Banner(char * bufPtr) {
/* The version string generated by CMVC during weekly build has a */
/* date which is the time when the mpidi_platform.h file is last */
/* updated. This date can be quite old and is better removed. */
- bzero(ver_buf, sizeof(ver_buf));
+ memset(ver_buf, 0, sizeof(ver_buf));
strncpy(ver_buf, level, sizeof(ver_buf)-1);
if ( cp = strchr(ver_buf, ',') ) *cp = '\0';
}
diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c
index e600dfe..70f2a60 100644
--- a/src/mpid/pamid/src/mpidi_util.c
+++ b/src/mpid/pamid/src/mpidi_util.c
@@ -69,7 +69,7 @@ void MPIDI_Set_mpich_env(int rank, int size) {
mpich_env->use_token_flow_control=MPIDI_Process.is_token_flow_control_on;
mpich_env->mp_statistics=MPIDI_Process.mp_statistics;
if (mpich_env->polling_interval == 0) {
- bzero(&config, sizeof(config));
+ memset(&config, 0, sizeof(config));
config.name = (pami_attribute_name_t)PAMI_CONTEXT_TIMER_INTERVAL;
rc= PAMI_Context_query(MPIDI_Context[0], &config, 1);
mpich_env->polling_interval = config.value.intval;;
@@ -78,7 +78,7 @@ void MPIDI_Set_mpich_env(int rank, int size) {
rc = putenv(polling_buf);
}
if (mpich_env->retransmit_interval == 0) {
- bzero(&config, sizeof(config));
+ memset(&config, 0, sizeof(config));
config.name = (pami_attribute_name_ext_t)PAMI_CONTEXT_RETRANSMIT_INTERVAL;
rc= PAMI_Context_query(MPIDI_Context[0], &config, 1);
mpich_env->retransmit_interval = config.value.intval;
@@ -150,7 +150,7 @@ void MPIDI_Setup_networkenv()
* mpi_printenv variable can print them out.
*/
if ( mpich_env->retransmit_interval == 0 ) {
- bzero(&config, sizeof(config));
+ memset(&config, 0, sizeof(config));
config.name = (pami_attribute_name_t)PAMI_CONTEXT_RETRANSMIT_INTERVAL;
rc= PAMI_Context_query(MPIDI_Context[0], &config, 1);
mpich_env->retransmit_interval = config.value.intval;
diff --git a/src/mutex/mutex_create.c b/src/mutex/mutex_create.c
index b015494..5bae747 100644
--- a/src/mutex/mutex_create.c
+++ b/src/mutex/mutex_create.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+#include <string.h>
#include <strings.h>
#include <mpi.h>
@@ -83,7 +84,7 @@ int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out)
if (i < my_count) {
MPI_Alloc_mem(nproc, MPI_INFO_NULL, &hdl->bases[i]);
assert(hdl->bases[i] != NULL);
- bzero(hdl->bases[i], nproc);
+ memset(hdl->bases[i], 0, nproc);
base = hdl->bases[i];
size = nproc;
diff --git a/src/pm/mpd/mpdroot.c b/src/pm/mpd/mpdroot.c
index 2476c66..7f517cd 100644
--- a/src/pm/mpd/mpdroot.c
+++ b/src/pm/mpd/mpdroot.c
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
/* setup default console */
strncpy(console_name,argv[1],NAME_LEN);
- bzero( (void *)&sa, sizeof( sa ) );
+ memset( (void *)&sa, 0, sizeof( sa ) );
sa.sun_family = AF_UNIX;
strncpy(sa.sun_path,console_name, sizeof(sa.sun_path)-1 );
sock = atoi(argv[2]);
diff --git a/src/pm/mpd/pmitest.c b/src/pm/mpd/pmitest.c
index e81776d..c12fe0e 100644
--- a/src/pm/mpd/pmitest.c
+++ b/src/pm/mpd/pmitest.c
@@ -146,7 +146,7 @@ int connect_to_pm( char *hostname, int portnum )
exit(-1);
}
- bzero( (void *)&sin, sizeof(sin) );
+ memset( (void *)&sin, 0, sizeof(sin) );
memmove( (void *)&sin.sin_addr, (void *)hp->h_addr, hp->h_length);
sin.sin_family = hp->h_addrtype;
sin.sin_port = htons( (unsigned short) portnum );
http://git.mpich.org/mpich.git/commitdiff/cabd1a06512932ffbbe8c307b0bfa537aba9a118
commit cabd1a06512932ffbbe8c307b0bfa537aba9a118
Author: Jeff Hammond <jhammond at alcf.anl.gov>
Date: Sat May 18 22:00:38 2013 -0500
Replace bcopy with memmove.
Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>
diff --git a/src/pm/mpd/pmitest.c b/src/pm/mpd/pmitest.c
index 32e2c2c..e81776d 100644
--- a/src/pm/mpd/pmitest.c
+++ b/src/pm/mpd/pmitest.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
@@ -146,7 +147,7 @@ int connect_to_pm( char *hostname, int portnum )
}
bzero( (void *)&sin, sizeof(sin) );
- bcopy( (void *)hp->h_addr, (void *)&sin.sin_addr, hp->h_length);
+ memmove( (void *)&sin.sin_addr, (void *)hp->h_addr, hp->h_length);
sin.sin_family = hp->h_addrtype;
sin.sin_port = htons( (unsigned short) portnum );
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/adio/ad_panfs/ad_panfs_open.c | 4 ++--
src/mpid/pamid/include/mpidi_trace.h | 4 ++--
src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c | 2 +-
src/mpid/pamid/src/dyntask/mpidi_port.c | 2 +-
src/mpid/pamid/src/mpid_init.c | 2 +-
src/mpid/pamid/src/mpidi_util.c | 6 +++---
src/mutex/mutex_create.c | 3 ++-
src/pm/mpd/mpdroot.c | 2 +-
src/pm/mpd/pmitest.c | 5 +++--
9 files changed, 16 insertions(+), 14 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list