[mpich2-commits] r7488 - in mpich2/trunk/src/pm/hydra: pm/pmiserv tools/ckpoint/blcr tools/ftb
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Nov 24 00:45:05 CST 2010
Author: balaji
Date: 2010-11-24 00:45:05 -0600 (Wed, 24 Nov 2010)
New Revision: 7488
Modified:
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
mpich2/trunk/src/pm/hydra/tools/ckpoint/blcr/ckpoint_blcr.c
mpich2/trunk/src/pm/hydra/tools/ftb/hydt_ftb.c
Log:
White space cleanup.
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-23 19:05:11 UTC (rev 7487)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-24 06:45:05 UTC (rev 7488)
@@ -31,7 +31,7 @@
struct HYD_pmcd_hdr {
/* The set of commands supported */
enum {
- INVALID_CMD = 0, /* for sanity testing */
+ INVALID_CMD = 0, /* for sanity testing */
/* UI to proxy commands */
PROC_INFO,
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-23 19:05:11 UTC (rev 7487)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-24 06:45:05 UTC (rev 7488)
@@ -527,7 +527,7 @@
MPL_snprintf(ftb_event_payload, HYDT_FTB_MAX_PAYLOAD_DATA, "pgid:%d ranks:%d-%d",
HYD_pmcd_pmip.local.pgid, HYD_pmcd_pmip.downstream.pmi_rank[0],
HYD_pmcd_pmip.downstream.pmi_rank
- [HYD_pmcd_pmip.local.proxy_process_count-1]);
+ [HYD_pmcd_pmip.local.proxy_process_count - 1]);
status = HYDT_ckpoint_restart(HYD_pmcd_pmip.local.pgid, HYD_pmcd_pmip.local.id,
env, HYD_pmcd_pmip.local.proxy_process_count,
pmi_ranks,
@@ -639,8 +639,8 @@
pmi_rank = HYDU_local_to_global_id(process_id,
HYD_pmcd_pmip.start_pid,
HYD_pmcd_pmip.local.proxy_core_count,
- HYD_pmcd_pmip.system_global.
- global_core_count);
+ HYD_pmcd_pmip.
+ system_global.global_core_count);
else
pmi_rank = HYD_pmcd_pmip.system_global.pmi_rank;
@@ -910,7 +910,7 @@
MPL_snprintf(ftb_event_payload, HYDT_FTB_MAX_PAYLOAD_DATA, "pgid:%d ranks:%d-%d",
HYD_pmcd_pmip.local.pgid, HYD_pmcd_pmip.downstream.pmi_rank[0],
HYD_pmcd_pmip.downstream.pmi_rank
- [HYD_pmcd_pmip.local.proxy_process_count-1]);
+ [HYD_pmcd_pmip.local.proxy_process_count - 1]);
status = HYDT_ckpoint_suspend(HYD_pmcd_pmip.local.pgid, HYD_pmcd_pmip.local.id);
if (status)
status = HYDT_ftb_publish("FTB_MPI_PROCS_CKPT_FAIL", ftb_event_payload);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-23 19:05:11 UTC (rev 7487)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-24 06:45:05 UTC (rev 7488)
@@ -226,7 +226,7 @@
goto fn_exit;
}
- if (hdr.cmd == PID_LIST) { /* Got PIDs */
+ if (hdr.cmd == PID_LIST) { /* Got PIDs */
status = handle_pid_list(fd, proxy);
HYDU_ERR_POP(status, "unable to receive PID list\n");
}
Modified: mpich2/trunk/src/pm/hydra/tools/ckpoint/blcr/ckpoint_blcr.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/ckpoint/blcr/ckpoint_blcr.c 2010-11-23 19:05:11 UTC (rev 7487)
+++ mpich2/trunk/src/pm/hydra/tools/ckpoint/blcr/ckpoint_blcr.c 2010-11-24 06:45:05 UTC (rev 7488)
@@ -141,29 +141,33 @@
HYDU_FUNC_ENTER();
listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- HYDU_ERR_CHKANDJUMP(status, ret < 0 , HYD_INTERNAL_ERROR, "socket() failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, ret < 0, HYD_INTERNAL_ERROR, "socket() failed, %s\n",
+ strerror(errno));
- memset ((void *)&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
+ memset((void *) &sin, 0, sizeof(sin));
+ sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- sin.sin_port = htons(0);
-
- ret = bind(listen_fd, (struct sockaddr *)&sin, sizeof(sin));
- HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "bind() failed, %s\n", strerror(errno));
+ sin.sin_port = htons(0);
+ ret = bind(listen_fd, (struct sockaddr *) &sin, sizeof(sin));
+ HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "bind() failed, %s\n",
+ strerror(errno));
+
ret = listen(listen_fd, SOMAXCONN);
- HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "listen() failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "listen() failed, %s\n",
+ strerror(errno));
len = sizeof(sin);
- ret = getsockname(listen_fd, (struct sockaddr *)&sin, &len);
- HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "getsockname() failed, %s\n", strerror(errno));
+ ret = getsockname(listen_fd, (struct sockaddr *) &sin, &len);
+ HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "getsockname() failed, %s\n",
+ strerror(errno));
*port = ntohs(sin.sin_port);
-
- fn_exit:
+
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
- fn_fail:
+ fn_fail:
goto fn_exit;
}
@@ -177,24 +181,25 @@
stdin/out/err sockets, then sets the appropriate entries in the in
out and err arrays. This also gets the pids of the restarted
processes. */
-static HYD_status wait_for_stdinouterr_sockets(int num_ranks, int *ranks, int *in, int *out, int *err, int *pid)
+static HYD_status wait_for_stdinouterr_sockets(int num_ranks, int *ranks, int *in, int *out,
+ int *err, int *pid)
{
HYD_status status = HYD_SUCCESS;
int ret;
int fd;
int i, c;
sock_ident_t id;
- int num_expected_connections = num_ranks * 2; /* wait for connections for stdout and err */
+ int num_expected_connections = num_ranks * 2; /* wait for connections for stdout and err */
HYDU_FUNC_ENTER();
/* if one of the processes is rank 0, we should wait for an
- additional connection for stdin */
+ * additional connection for stdin */
for (i = 0; i < num_ranks; ++i)
if (ranks[i] == 0) {
++num_expected_connections;
break;
}
-
+
for (c = 0; c < num_expected_connections; ++c) {
size_t len;
char *id_p;
@@ -202,31 +207,33 @@
do {
struct sockaddr_in rmt_addr;
socklen_t sa_len = sizeof(rmt_addr);;
- fd = accept(listen_fd, (struct sockaddr *)&rmt_addr, &sa_len);
+ fd = accept(listen_fd, (struct sockaddr *) &rmt_addr, &sa_len);
} while (fd && errno == EINTR);
- HYDU_ERR_CHKANDJUMP(status, fd == -1, HYD_INTERNAL_ERROR, "accept failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, fd == -1, HYD_INTERNAL_ERROR, "accept failed, %s\n",
+ strerror(errno));
/* read the socket identifier */
len = sizeof(id);
- id_p = (char *)&id;
+ id_p = (char *) &id;
do {
do {
ret = read(fd, id_p, len);
} while (ret == 0 || (ret == -1 && errno == EINTR));
- HYDU_ERR_CHKANDJUMP(status, ret == -1, HYD_INTERNAL_ERROR, "read failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, ret == -1, HYD_INTERNAL_ERROR, "read failed, %s\n",
+ strerror(errno));
len -= ret;
id_p += ret;
} while (len);
/* determine the index for this process in the stdout/err
- arrays */
+ * arrays */
for (i = 0; i < num_ranks; ++i)
if (ranks[i] == id.rank)
break;
HYDU_ASSERT(i < num_ranks, status);
/* assign the fd */
- switch(id.socktype) {
+ switch (id.socktype) {
case IN_SOCK:
HYDU_ASSERT(id.rank == 0, status);
*in = fd;
@@ -247,13 +254,14 @@
}
ret = close(listen_fd);
- HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "close of listener port failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, ret, HYD_INTERNAL_ERROR, "close of listener port failed, %s\n",
+ strerror(errno));
- fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
- fn_fail:
+ fn_fail:
goto fn_exit;
}
@@ -347,7 +355,7 @@
char filename[256];
char port_str[64];
int port;
-
+
HYDU_FUNC_ENTER();
mypid = getpid();
@@ -364,9 +372,11 @@
HYDU_ERR_POP(status, "blcr restart\n");
/* open the checkpoint file */
- MPL_snprintf(filename, sizeof(filename), "%s/context-num%d-%d-%d", prefix, ckpt_num, pgid, id);
+ MPL_snprintf(filename, sizeof(filename), "%s/context-num%d-%d-%d", prefix, ckpt_num, pgid,
+ id);
context_fd = open(filename, O_RDONLY /* | O_LARGEFILE */);
- HYDU_ERR_CHKANDJUMP(status, context_fd < 0, HYD_INTERNAL_ERROR, "open failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP(status, context_fd < 0, HYD_INTERNAL_ERROR, "open failed, %s\n",
+ strerror(errno));
/* ... initialize the request structure */
cr_initialize_restart_args_t(&args);
Modified: mpich2/trunk/src/pm/hydra/tools/ftb/hydt_ftb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/ftb/hydt_ftb.c 2010-11-23 19:05:11 UTC (rev 7487)
+++ mpich2/trunk/src/pm/hydra/tools/ftb/hydt_ftb.c 2010-11-24 06:45:05 UTC (rev 7488)
@@ -10,11 +10,11 @@
static FTB_client_handle_t ch;
static FTB_event_info_t event_info[] = {
- { "FTB_MPI_PROCS_RESTARTED", "info" },
- { "FTB_MPI_PROCS_RESTART_FAIL", "error" },
- { "FTB_MPI_PROCS_CKPTED", "info" },
- { "FTB_MPI_PROCS_CKPT_FAILED", "error" },
- { "FTB_MPI_PROCS_DEAD", "error" }
+ {"FTB_MPI_PROCS_RESTARTED", "info"},
+ {"FTB_MPI_PROCS_RESTART_FAIL", "error"},
+ {"FTB_MPI_PROCS_CKPTED", "info"},
+ {"FTB_MPI_PROCS_CKPT_FAILED", "error"},
+ {"FTB_MPI_PROCS_DEAD", "error"}
};
HYD_status HYDT_ftb_init(void)
More information about the mpich2-commits
mailing list