Commit d4bc12d8 authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r6072] White space cleanup.

parent 77ae7d8b
......@@ -508,6 +508,7 @@ static HYD_status fn_get_usize(int fd, int pgid, char *args[])
}
static char *mcmd_args[HYD_NUM_TMP_STRINGS] = { NULL };
static int mcmd_num_args = 0;
static HYD_status fn_spawn(int fd, int pgid, char *args[])
......@@ -526,7 +527,8 @@ static HYD_status fn_spawn(int fd, int pgid, char *args[])
struct HYD_pmcd_token_segment *segment_list = NULL;
int token_count, i, j, k, pmi_id = -1, new_pgid, total_spawns, offset, argcnt, num_segments;
int token_count, i, j, k, pmi_id = -1, new_pgid, total_spawns, offset;
int argcnt, num_segments;
char *pmi_port, *control_port, *proxy_args[HYD_NUM_TMP_STRINGS] = { NULL };
char *tmp[HYD_NUM_TMP_STRINGS];
HYD_status status = HYD_SUCCESS;
......
......@@ -193,7 +193,8 @@ static HYD_status fn_fullinit(int fd, int pgid, char *args[])
for (pg = &HYD_handle.pg_list; pg && pg->pgid != pgid; pg = pg->next);
if (!pg)
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "could not find pg with pgid %d\n", pgid);
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "could not find pg with pgid %d\n",
pgid);
/* Add the process to the appropriate PG */
status = HYD_pmcd_pmi_add_process_to_pg(pg, fd, rank);
......
......@@ -205,7 +205,8 @@ static HYD_status iface_fn(char *arg, char ***argv)
sa = (struct sockaddr_in *) ifa->ifa_addr;
iface_ip = inet_ntop(AF_INET, (void *) &(sa->sin_addr), buf, MAX_HOSTNAME_LEN);
if (!iface_ip)
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "unable to find IP for interface %s\n",
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR,
"unable to find IP for interface %s\n",
HYD_pmcd_pmip.user_global.iface);
freeifaddrs(ifaddr);
......@@ -693,8 +694,10 @@ HYD_status HYD_pmcd_pmi_proxy_launch_procs(void)
for (i = 0; i < HYD_pmcd_pmip.local.proxy_process_count; i++)
HYD_pmcd_pmip.downstream.exit_status[i] = -1;
status = HYDT_bind_init(HYD_pmcd_pmip.local.local_binding ? HYD_pmcd_pmip.local.local_binding :
HYD_pmcd_pmip.user_global.binding, HYD_pmcd_pmip.user_global.bindlib);
status = HYDT_bind_init(HYD_pmcd_pmip.local.local_binding ?
HYD_pmcd_pmip.local.local_binding :
HYD_pmcd_pmip.user_global.binding,
HYD_pmcd_pmip.user_global.bindlib);
HYDU_ERR_POP(status, "unable to initialize process binding\n");
status = HYDT_ckpoint_init(HYD_pmcd_pmip.user_global.ckpointlib,
......
......@@ -353,7 +353,7 @@ HYD_status HYD_pmcd_pmi_serv_control_cb(int fd, HYD_event_t events, void *userp)
proxy = (struct HYD_proxy *) userp;
pg = proxy->pg;
if (proxy->pid == NULL) { /* Got PIDs */
if (proxy->pid == NULL) { /* Got PIDs */
HYDU_MALLOC(proxy->pid, int *, proxy->proxy_process_count * sizeof(int), status);
status = HYDU_sock_read(fd, (void *) proxy->pid,
proxy->proxy_process_count * sizeof(int),
......@@ -453,7 +453,8 @@ HYD_status HYD_pmcd_pmi_serv_cleanup(void)
cmd = KILL_JOB;
status = HYDU_sock_trywrite(proxy->control_fd, &cmd, sizeof(enum HYD_pmu_cmd));
if (status != HYD_SUCCESS) {
HYDU_warn_printf("unable to send data to the proxy on %s\n", proxy->node.hostname);
HYDU_warn_printf("unable to send data to the proxy on %s\n",
proxy->node.hostname);
overall_status = HYD_INTERNAL_ERROR;
continue; /* Move on to the next proxy */
}
......
......@@ -215,7 +215,8 @@ HYD_status HYD_pmcd_pmi_fill_in_exec_launch_info(char *pmi_port, int pmi_id, str
arg = HYDU_strlist_lastidx(proxy->exec_launch_info);
if (HYD_handle.user_global.global_env.prop) {
proxy->exec_launch_info[arg++] = HYDU_strdup("--genv-prop");
proxy->exec_launch_info[arg++] = HYDU_strdup(HYD_handle.user_global.global_env.prop);
proxy->exec_launch_info[arg++] =
HYDU_strdup(HYD_handle.user_global.global_env.prop);
}
proxy->exec_launch_info[arg++] = HYDU_strdup("--start-pid");
......
......@@ -17,7 +17,7 @@ HYD_status HYDT_dmx_init(char **demux)
HYDU_FUNC_ENTER();
if (!(*demux)) { /* user didn't specify anything */
if (!(*demux)) { /* user didn't specify anything */
#if defined HAVE_POLL
HYDT_dmxu_fns.wait_for_event = HYDT_dmxu_poll_wait_for_event;
HYDT_dmxu_fns.stdin_valid = HYDT_dmxu_poll_stdin_valid;
......@@ -34,7 +34,7 @@ HYD_status HYDT_dmx_init(char **demux)
HYDT_dmxu_fns.stdin_valid = HYDT_dmxu_poll_stdin_valid;
#endif /* HAVE_POLL */
}
else if (!strcmp(*demux, "select")) { /* user wants to use select */
else if (!strcmp(*demux, "select")) { /* user wants to use select */
#if defined HAVE_SELECT
HYDT_dmxu_fns.wait_for_event = HYDT_dmxu_select_wait_for_event;
HYDT_dmxu_fns.stdin_valid = HYDT_dmxu_select_stdin_valid;
......@@ -43,7 +43,8 @@ HYD_status HYDT_dmx_init(char **demux)
if (HYDT_dmxu_fns.wait_for_event == NULL || HYDT_dmxu_fns.stdin_valid == NULL) {
/* We couldn't find anything; return an error */
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "cannot find an appropriate demux engine\n");
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
"cannot find an appropriate demux engine\n");
}
fn_exit:
......@@ -86,7 +87,8 @@ HYD_status HYDT_dmx_register_fd(int num_fds, int *fd, HYD_event_t events, void *
}
#endif /* HAVE_ERROR_CHECKING */
HYDU_MALLOC(cb_element, struct HYDT_dmxu_callback *, sizeof(struct HYDT_dmxu_callback), status);
HYDU_MALLOC(cb_element, struct HYDT_dmxu_callback *, sizeof(struct HYDT_dmxu_callback),
status);
cb_element->num_fds = num_fds;
HYDU_MALLOC(cb_element->fd, int *, num_fds * sizeof(int), status);
memcpy(cb_element->fd, fd, num_fds * sizeof(int));
......
......@@ -15,7 +15,8 @@ HYD_status HYDT_dmxu_poll_wait_for_event(int wtime)
HYDU_FUNC_ENTER();
HYDU_MALLOC(pollfds, struct pollfd *, HYDT_dmxu_num_cb_fds * sizeof(struct pollfd), status);
HYDU_MALLOC(pollfds, struct pollfd *, HYDT_dmxu_num_cb_fds * sizeof(struct pollfd),
status);
for (i = 0, run = HYDT_dmxu_cb_list; run; run = run->next) {
for (j = 0; j < run->num_fds; j++) {
......
......@@ -166,7 +166,8 @@ static HYD_status process_mfile_token(char *token, int newline)
for (node = HYD_handle.node_list; node->next; node = node->next);
if (node->local_binding)
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "duplicate local binding setting\n");
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
"duplicate local binding setting\n");
node->local_binding = HYDU_strdup(binding);
}
......@@ -587,14 +588,12 @@ static HYD_status info_fn(char *arg, char ***argv)
" Binding libraries available: %s\n",
HYDRA_BINDLIB_NAMES);
HYDU_dump_noprefix(stdout,
" Resource management kernels available: %s\n",
HYDRA_RMK_NAMES);
" Resource management kernels available: %s\n", HYDRA_RMK_NAMES);
HYDU_dump_noprefix(stdout,
" Checkpointing libraries available: %s\n",
HYDRA_CKPOINTLIB_NAMES);
HYDU_dump_noprefix(stdout,
" Demux engines available: %s\n",
HYDRA_DEMUX_NAMES);
" Demux engines available: %s\n", HYDRA_DEMUX_NAMES);
HYDU_ERR_SETANDJUMP(status, HYD_GRACEFUL_ABORT, "");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment