[mpich2-commits] r5461 - in mpich2/trunk/src/pm/hydra: bootstrap/fork bootstrap/rsh bootstrap/slurm bootstrap/ssh css/utils include pm/pmiserv pm/utils ui/mpiexec ui/utils utils/args utils/bind/plpa utils/ckpoint utils/ckpoint/blcr utils/dbg utils/env utils/others utils/sock
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Oct 14 07:10:26 CDT 2009
Author: balaji
Date: 2009-10-14 07:10:26 -0500 (Wed, 14 Oct 2009)
New Revision: 5461
Modified:
mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c
mpich2/trunk/src/pm/hydra/bootstrap/rsh/rsh_launch.c
mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm.h
mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_launch.c
mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_query_node_list.c
mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
mpich2/trunk/src/pm/hydra/css/utils/cssu_tmp.c
mpich2/trunk/src/pm/hydra/include/hydra_base.h
mpich2/trunk/src/pm/hydra/include/hydra_utils.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v2.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_utils.c
mpich2/trunk/src/pm/hydra/pm/utils/pmi.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/callback.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
mpich2/trunk/src/pm/hydra/utils/args/args.c
mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c
mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.h
mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.c
mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.h
mpich2/trunk/src/pm/hydra/utils/ckpoint/ckpoint.c
mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c
mpich2/trunk/src/pm/hydra/utils/env/env.c
mpich2/trunk/src/pm/hydra/utils/others/others.c
mpich2/trunk/src/pm/hydra/utils/sock/sock.c
Log:
White space changes.
Modified: mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -43,8 +43,7 @@
* everyone else, it's NULL. */
status = HYDU_create_process(client_arg, NULL,
(process_id == 0 ? &proxy->in : NULL),
- &proxy->out, &proxy->err,
- &proxy->pid, -1);
+ &proxy->out, &proxy->err, &proxy->pid, -1);
HYDU_ERR_POP(status, "create process returned error\n");
HYDU_free_strlist(client_arg);
Modified: mpich2/trunk/src/pm/hydra/bootstrap/rsh/rsh_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/rsh/rsh_launch.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/rsh/rsh_launch.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -80,8 +80,7 @@
* everyone else, it's NULL. */
status = HYDU_create_process(client_arg, NULL,
(process_id == 0 ? &proxy->in : NULL),
- &proxy->out, &proxy->err,
- &proxy->pid, -1);
+ &proxy->out, &proxy->err, &proxy->pid, -1);
HYDU_ERR_POP(status, "create process returned error\n");
HYDU_free_strlist(client_arg);
Modified: mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm.h
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -12,7 +12,6 @@
HYD_Status HYD_BSCD_slurm_launch_procs(char **global_args, const char *proxy_id_str,
struct HYD_Proxy *proxy_list);
HYD_Status HYD_BSCD_slurm_query_proxy_id(int *proxy_id);
-HYD_Status HYD_BSCD_slurm_query_node_list(int *num_nodes,
- struct HYD_Proxy **proxy_list);
+HYD_Status HYD_BSCD_slurm_query_node_list(int *num_nodes, struct HYD_Proxy **proxy_list);
#endif /* SLURM_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_launch.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_launch.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -96,9 +96,7 @@
status = HYDU_create_process(client_arg, NULL,
&proxy_list->in,
- &proxy_list->out,
- &proxy_list->err,
- &proxy_list->pid, -1);
+ &proxy_list->out, &proxy_list->err, &proxy_list->pid, -1);
HYDU_ERR_POP(status, "bootstrap spawn process returned error\n");
HYDU_free_strlist(client_arg);
Modified: mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_query_node_list.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/slurm/slurm_query_node_list.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -99,8 +99,7 @@
goto fn_exit;
}
-HYD_Status HYD_BSCD_slurm_query_node_list(int *num_nodes,
- struct HYD_Proxy **proxy_list)
+HYD_Status HYD_BSCD_slurm_query_node_list(int *num_nodes, struct HYD_Proxy **proxy_list)
{
char *str, *num_procs;
char *tmp1[HYD_NUM_TMP_STRINGS], *tmp2[HYD_NUM_TMP_STRINGS];
Modified: mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -88,8 +88,7 @@
* everyone else, it's NULL. */
status = HYDU_create_process(client_arg, NULL,
(process_id == 0 ? &proxy->in : NULL),
- &proxy->out, &proxy->err,
- &proxy->pid, -1);
+ &proxy->out, &proxy->err, &proxy->pid, -1);
HYDU_ERR_POP(status, "create process returned error\n");
HYDU_free_strlist(client_arg);
Modified: mpich2/trunk/src/pm/hydra/css/utils/cssu_tmp.c
===================================================================
--- mpich2/trunk/src/pm/hydra/css/utils/cssu_tmp.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/css/utils/cssu_tmp.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -10,4 +10,4 @@
/* This is here to suppress the "has no symbols" warning on OS X. See
* the MPIU_SUPPRESS_OSX_HAS_NO_SYMBOLS_WARNING macro in mpiutil.h for
* more information. */
-static int dummy ATTRIBUTE((unused,used)) = 0;
+static int dummy ATTRIBUTE((unused, used)) = 0;
Modified: mpich2/trunk/src/pm/hydra/include/hydra_base.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_base.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/include/hydra_base.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -159,7 +159,7 @@
HYD_Env_t *system;
HYD_Env_t *user;
HYD_Env_t *inherited;
- char *prop;
+ char *prop;
};
/* List of contiguous segments of processes on a proxy */
@@ -184,13 +184,13 @@
char *hostname;
char **exec_args;
- int proxy_id;
- int active;
+ int proxy_id;
+ int active;
- int pid;
- int in; /* stdin is only valid for proxy_id 0 */
- int out;
- int err;
+ int pid;
+ int in; /* stdin is only valid for proxy_id 0 */
+ int out;
+ int err;
int proxy_core_count;
Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -123,7 +123,7 @@
/* alloc */
void HYDU_init_user_global(struct HYD_User_global *user_global);
-void HYDU_init_global_env(struct HYD_Env_global*global_env);
+void HYDU_init_global_env(struct HYD_Env_global *global_env);
HYD_Status HYDU_alloc_proxy(struct HYD_Proxy **proxy);
HYD_Status HYDU_alloc_exec_info(struct HYD_Exec_info **exec_info);
void HYDU_free_exec_info_list(struct HYD_Exec_info *exec_info_list);
@@ -146,13 +146,13 @@
/* debug */
HYD_Status HYDU_dbg_init(const char *str);
-void HYDU_dump_prefix(FILE *fp);
-void HYDU_dump_noprefix(FILE *fp, const char *str, ...);
-void HYDU_dump(FILE *fp, const char *str, ...);
+void HYDU_dump_prefix(FILE * fp);
+void HYDU_dump_noprefix(FILE * fp, const char *str, ...);
+void HYDU_dump(FILE * fp, const char *str, ...);
/* env */
HYD_Status HYDU_env_to_str(HYD_Env_t * env, char **str);
-HYD_Status HYDU_str_to_env(char *str, HYD_Env_t **env);
+HYD_Status HYDU_str_to_env(char *str, HYD_Env_t ** env);
HYD_Status HYDU_list_inherited_env(HYD_Env_t ** env_list);
HYD_Env_t *HYDU_env_list_dup(HYD_Env_t * env);
HYD_Status HYDU_env_create(HYD_Env_t ** env, const char *env_name, char *env_value);
@@ -182,7 +182,7 @@
/* others */
HYD_Status HYDU_merge_proxy_segment(char *name, struct HYD_Proxy_segment *segment,
- struct HYD_Proxy **proxy_list);
+ struct HYD_Proxy **proxy_list);
int HYDU_local_to_global_id(int local_id, int core_count,
struct HYD_Proxy_segment *segment_list, int global_core_count);
@@ -294,7 +294,7 @@
/* checkpointing */
HYD_Status HYDU_ckpoint_init(char *ckpointlib, char *ckpoint_prefix);
HYD_Status HYDU_ckpoint_suspend(void);
-HYD_Status HYDU_ckpoint_restart(HYD_Env_t *envlist, int num_ranks, int ranks[], int *in,
+HYD_Status HYDU_ckpoint_restart(HYD_Env_t * envlist, int num_ranks, int ranks[], int *in,
int *out, int *err);
#endif /* HYDRA_UTILS_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -157,8 +157,7 @@
}
-HYD_Status HYD_PMCD_pmi_add_kvs(const char *key, char *val, HYD_PMCD_pmi_kvs_t * kvs,
- int *ret)
+HYD_Status HYD_PMCD_pmi_add_kvs(const char *key, char *val, HYD_PMCD_pmi_kvs_t * kvs, int *ret)
{
HYD_PMCD_pmi_kvs_pair_t *key_pair, *run;
HYD_Status status = HYD_SUCCESS;
@@ -482,7 +481,8 @@
HYD_pg_list->num_procs = HYD_pg_list->num_subgroups;
/* Allocate and initialize the connected ranks */
- HYDU_MALLOC(HYD_pg_list->conn_procs, int *, HYD_pg_list->num_subgroups * sizeof(int), status);
+ HYDU_MALLOC(HYD_pg_list->conn_procs, int *, HYD_pg_list->num_subgroups * sizeof(int),
+ status);
for (i = 0; i < HYD_pg_list->num_subgroups; i++)
HYD_pg_list->conn_procs[i] = 0;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v2.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v2.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v2.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -71,7 +71,7 @@
HYDU_FUNC_ENTER();
- HYDU_snprintf(cmdlen, 7, "%6u", (unsigned)strlen(cmd));
+ HYDU_snprintf(cmdlen, 7, "%6u", (unsigned) strlen(cmd));
status = HYDU_sock_write(fd, cmdlen, 6);
HYDU_ERR_POP(status, "error writing PMI line\n");
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -136,7 +136,8 @@
}
else { /* Persistent mode */
status = HYDU_sock_listen(&listenfd, NULL,
- (uint16_t *) & HYD_PMCD_pmi_proxy_params.upstream.server_port);
+ (uint16_t *) & HYD_PMCD_pmi_proxy_params.upstream.
+ server_port);
HYDU_ERR_POP(status, "unable to listen on socket\n");
/* Register the listening socket with the demux engine */
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -19,7 +19,7 @@
/* PMI */
char *pmi_port_str;
- } system_global; /* Global system parameters */
+ } system_global; /* Global system parameters */
struct {
/* Upstream server contact information */
@@ -45,12 +45,12 @@
/* Proxy details */
struct {
- int id;
- int core_count;
- int process_count;
+ int id;
+ int core_count;
+ int process_count;
/* Flag to tell whether the processes are launched */
- int procs_are_launched;
+ int procs_are_launched;
/* stdin related variables */
int stdin_buf_offset;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -121,8 +121,7 @@
/* Global env */
if ((!strcmp(*argv, "--global-inherited-env")) ||
- (!strcmp(*argv, "--global-system-env")) ||
- (!strcmp(*argv, "--global-user-env"))) {
+ (!strcmp(*argv, "--global-system-env")) || (!strcmp(*argv, "--global-user-env"))) {
argtype = *argv;
@@ -144,13 +143,16 @@
if (!strcmp(argtype, "--global-inherited-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.inherited);
+ &HYD_PMCD_pmi_proxy_params.user_global.global_env.
+ inherited);
else if (!strcmp(argtype, "--global-system-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.system);
+ &HYD_PMCD_pmi_proxy_params.user_global.global_env.
+ system);
else if (!strcmp(argtype, "--global-user-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.user);
+ &HYD_PMCD_pmi_proxy_params.user_global.global_env.
+ user);
HYDU_FREE(env);
}
@@ -309,7 +311,8 @@
if (!strcmp(*argv, "--proxy-port")) {
++argv;
if (HYD_PMCD_pmi_proxy_params.user_global.launch_mode == HYD_LAUNCH_RUNTIME) {
- HYD_PMCD_pmi_proxy_params.upstream.server_name = HYDU_strdup(strtok(*argv, ":"));
+ HYD_PMCD_pmi_proxy_params.upstream.server_name =
+ HYDU_strdup(strtok(*argv, ":"));
HYD_PMCD_pmi_proxy_params.upstream.server_port = atoi(strtok(NULL, ":"));
}
else {
@@ -537,7 +540,7 @@
HYD_PMCD_pmi_proxy_params.segment_list,
HYD_PMCD_pmi_proxy_params.system_global.global_core_count);
}
-
+
HYDU_MALLOC(HYD_PMCD_pmi_proxy_params.downstream.out, int *,
HYD_PMCD_pmi_proxy_params.local.process_count * sizeof(int), status);
HYDU_MALLOC(HYD_PMCD_pmi_proxy_params.downstream.err, int *,
@@ -609,7 +612,10 @@
envstr = strtok(list, ",");
while (envstr) {
- env = HYDU_env_lookup(envstr, HYD_PMCD_pmi_proxy_params.user_global.global_env.inherited);
+ env =
+ HYDU_env_lookup(envstr,
+ HYD_PMCD_pmi_proxy_params.user_global.global_env.
+ inherited);
if (env) {
status = HYDU_append_env_to_list(*env, &prop_env);
HYDU_ERR_POP(status, "unable to add env to list\n");
@@ -619,8 +625,7 @@
}
/* Next priority order is the global user env */
- for (env = HYD_PMCD_pmi_proxy_params.user_global.global_env.user; env;
- env = env->next) {
+ for (env = HYD_PMCD_pmi_proxy_params.user_global.global_env.user; env; env = env->next) {
status = HYDU_append_env_to_list(*env, &prop_env);
HYDU_ERR_POP(status, "unable to add env to list\n");
}
@@ -653,7 +658,8 @@
pmi_id = HYDU_local_to_global_id(process_id,
HYD_PMCD_pmi_proxy_params.local.core_count,
HYD_PMCD_pmi_proxy_params.segment_list,
- HYD_PMCD_pmi_proxy_params.system_global.global_core_count);
+ HYD_PMCD_pmi_proxy_params.system_global.
+ global_core_count);
if (HYD_PMCD_pmi_proxy_params.system_global.pmi_port_str) {
str = HYDU_int_to_str(pmi_id);
@@ -676,10 +682,12 @@
if (pmi_id == 0) {
status = HYDU_create_process(client_args, prop_env,
&HYD_PMCD_pmi_proxy_params.downstream.in,
- &HYD_PMCD_pmi_proxy_params.downstream.out[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.err[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.pid[process_id],
- core);
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ out[process_id],
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ err[process_id],
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ pid[process_id], core);
HYD_PMCD_pmi_proxy_params.local.stdin_buf_offset = 0;
HYD_PMCD_pmi_proxy_params.local.stdin_buf_count = 0;
@@ -694,10 +702,12 @@
}
else {
status = HYDU_create_process(client_args, prop_env, NULL,
- &HYD_PMCD_pmi_proxy_params.downstream.out[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.err[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.pid[process_id],
- core);
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ out[process_id],
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ err[process_id],
+ &HYD_PMCD_pmi_proxy_params.downstream.
+ pid[process_id], core);
}
HYDU_ERR_POP(status, "create process returned error\n");
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -55,7 +55,7 @@
HYDU_MALLOC(buf, char *, buflen, status);
bufptr = buf;
-
+
/*
* FIXME: This is a big hack. We temporarily initialize to
* PMI-v1. If the incoming message is an "init", it will
@@ -91,8 +91,8 @@
/* Unexpected termination of connection */
if (linelen == 0)
break;
- else
- *(bufptr-1) = '\0';
+ else
+ *(bufptr - 1) = '\0';
/* Here we only get PMI-1 commands or backward compatible
* PMI-2 commands, so we always explicitly use the PMI-1
@@ -217,8 +217,7 @@
HYDU_ERR_POP(status, "accept error\n");
/* Read the proxy ID */
- status = HYDU_sock_read(accept_fd, &proxy_id, sizeof(int), &count,
- HYDU_SOCK_COMM_MSGWAIT);
+ status = HYDU_sock_read(accept_fd, &proxy_id, sizeof(int), &count, HYDU_SOCK_COMM_MSGWAIT);
HYDU_ERR_POP(status, "sock read returned error\n");
/* Find the proxy */
@@ -300,8 +299,7 @@
status = HYDU_sock_trywrite(proxy->control_fd, &cmd,
sizeof(enum HYD_PMCD_pmi_proxy_cmds));
if (status != HYD_SUCCESS) {
- HYDU_Warn_printf("unable to send data to the proxy on %s\n",
- proxy->hostname);
+ HYDU_Warn_printf("unable to send data to the proxy on %s\n", proxy->hostname);
overall_status = HYD_INTERNAL_ERROR;
continue; /* Move on to the next proxy */
}
@@ -327,16 +325,16 @@
FORALL_ACTIVE_PROXIES(proxy, HYD_handle.proxy_list) {
cmd = CKPOINT;
status = HYDU_sock_write(proxy->control_fd, &cmd,
- sizeof(enum HYD_PMCD_pmi_proxy_cmds));
+ sizeof(enum HYD_PMCD_pmi_proxy_cmds));
HYDU_ERR_POP(status, "unable to send checkpoint message\n");
}
HYDU_FUNC_EXIT();
-fn_exit:
+ fn_exit:
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -52,16 +52,14 @@
* work.
*/
- status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port,
- &proxy->control_fd);
+ status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port, &proxy->control_fd);
HYDU_ERR_POP(status, "unable to connect to proxy\n");
status = HYD_PMCD_pmi_send_exec_info(proxy);
HYDU_ERR_POP(status, "error sending executable info\n");
/* Create an stdout socket */
- status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port,
- &proxy->out);
+ status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port, &proxy->out);
HYDU_ERR_POP(status, "unable to connect to proxy\n");
cmd = USE_AS_STDOUT;
@@ -69,8 +67,7 @@
HYDU_ERR_POP(status, "unable to write data to proxy\n");
/* Create an stderr socket */
- status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port,
- &proxy->err);
+ status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port, &proxy->err);
HYDU_ERR_POP(status, "unable to connect to proxy\n");
cmd = USE_AS_STDERR;
@@ -79,13 +76,11 @@
/* If rank 0 is here, create an stdin socket */
if (proxy->proxy_id == 0) {
- status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port,
- &proxy->in);
+ status = HYDU_sock_connect(proxy->hostname, HYD_handle.proxy_port, &proxy->in);
HYDU_ERR_POP(status, "unable to connect to proxy\n");
cmd = USE_AS_STDIN;
- status = HYDU_sock_write(proxy->in, &cmd,
- sizeof(enum HYD_PMCD_pmi_proxy_cmds));
+ status = HYDU_sock_write(proxy->in, &cmd, sizeof(enum HYD_PMCD_pmi_proxy_cmds));
HYDU_ERR_POP(status, "unable to write data to proxy\n");
}
@@ -223,7 +218,7 @@
for (exec_count = 0, exec = proxy->exec_list; exec; exec = exec->next)
exec_count++;
- total_args = HYD_NUM_TMP_STRINGS; /* For the basic arguments */
+ total_args = HYD_NUM_TMP_STRINGS; /* For the basic arguments */
/* Environments */
total_args += inherited_env_count;
@@ -236,8 +231,7 @@
/* For each exec add a few strings */
total_args += (exec_count * HYD_NUM_TMP_STRINGS);
- HYDU_MALLOC(proxy->exec_args, char **, total_args * sizeof(char *),
- status);
+ HYDU_MALLOC(proxy->exec_args, char **, total_args * sizeof(char *), status);
arg = 0;
proxy->exec_args[arg++] = HYDU_strdup("--global-core-count");
@@ -274,7 +268,8 @@
proxy->exec_args[arg++] = HYDU_strdup("--ckpoint-restart");
proxy->exec_args[arg++] = HYDU_strdup("--global-inherited-env");
- for (i = 0, env = HYD_handle.user_global.global_env.inherited; env; env = env->next, i++);
+ for (i = 0, env = HYD_handle.user_global.global_env.inherited; env;
+ env = env->next, i++);
proxy->exec_args[arg++] = HYDU_int_to_str(i);
for (env = HYD_handle.user_global.global_env.inherited; env; env = env->next) {
@@ -504,7 +499,8 @@
else {
while (1) {
/* Wait for some event to occur */
- status = HYD_DMX_wait_for_event(HYDU_time_left(HYD_handle.start, HYD_handle.timeout));
+ status =
+ HYD_DMX_wait_for_event(HYDU_time_left(HYD_handle.start, HYD_handle.timeout));
HYDU_ERR_POP(status, "error waiting for event\n");
/* If the timeout expired, raise a SIGINT and kill all the
@@ -542,7 +538,8 @@
break;
/* If not, wait for some event to occur */
- status = HYD_DMX_wait_for_event(HYDU_time_left(HYD_handle.start, HYD_handle.timeout));
+ status =
+ HYD_DMX_wait_for_event(HYDU_time_left(HYD_handle.start, HYD_handle.timeout));
HYDU_ERR_POP(status, "error waiting for event\n");
} while (1);
}
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_utils.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_utils.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -18,8 +18,7 @@
HYDU_FUNC_ENTER();
cmd = PROC_INFO;
- status = HYDU_sock_write(proxy->control_fd, &cmd,
- sizeof(enum HYD_PMCD_pmi_proxy_cmds));
+ status = HYDU_sock_write(proxy->control_fd, &cmd, sizeof(enum HYD_PMCD_pmi_proxy_cmds));
HYDU_ERR_POP(status, "unable to write data to proxy\n");
/* Check how many arguments we have */
@@ -34,8 +33,7 @@
status = HYDU_sock_write(proxy->control_fd, &arg_len, sizeof(int));
HYDU_ERR_POP(status, "unable to write data to proxy\n");
- status = HYDU_sock_write(proxy->control_fd, proxy->exec_args[i],
- arg_len);
+ status = HYDU_sock_write(proxy->control_fd, proxy->exec_args[i], arg_len);
HYDU_ERR_POP(status, "unable to write data to proxy\n");
}
Modified: mpich2/trunk/src/pm/hydra/pm/utils/pmi.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/utils/pmi.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/pm/utils/pmi.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -8,4 +8,4 @@
/* This is here to suppress the "has no symbols" warning on OS X. See
* the MPIU_SUPPRESS_OSX_HAS_NO_SYMBOLS_WARNING macro in mpiutil.h for
* more information. */
-static int dummy ATTRIBUTE((unused,used)) = 0;
+static int dummy ATTRIBUTE((unused, used)) = 0;
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/callback.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/callback.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/callback.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -105,7 +105,8 @@
HYDU_FUNC_ENTER();
status = HYDU_sock_stdin_cb(fd, events, 0, HYD_handle.stdin_tmp_buf,
- &HYD_handle.stdin_buf_count, &HYD_handle.stdin_buf_offset, &closed);
+ &HYD_handle.stdin_buf_count, &HYD_handle.stdin_buf_offset,
+ &closed);
HYDU_ERR_POP(status, "stdin callback error\n");
if (closed) {
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -12,7 +12,8 @@
#include "uiu.h"
#include "demux.h"
-HYD_Handle HYD_handle = { { 0 } };
+HYD_Handle HYD_handle = { {0}
+};
static void usage(void)
{
@@ -179,7 +180,7 @@
if (HYD_handle.user_global.debug)
HYD_UIU_print_params();
- HYDU_time_set(&HYD_handle.start, NULL); /* NULL implies right now */
+ HYDU_time_set(&HYD_handle.start, NULL); /* NULL implies right now */
if (getenv("MPIEXEC_TIMEOUT"))
timeout = atoi(getenv("MPIEXEC_TIMEOUT"));
else
@@ -196,9 +197,10 @@
for (exec = proxy->exec_list; exec; exec = exec->next) {
for (i = 0; i < exec->proc_count; i++) {
HYDU_dump(stdout, "%d", HYDU_local_to_global_id(process_id++,
- proxy->proxy_core_count,
- proxy->segment_list,
- HYD_handle.global_core_count));
+ proxy->proxy_core_count,
+ proxy->segment_list,
+ HYD_handle.
+ global_core_count));
if (i < exec->proc_count - 1)
HYDU_dump(stdout, ",");
}
@@ -253,8 +255,7 @@
}
if (proxy->in != -1) {
- status = HYD_DMX_register_fd(1, &proxy->in, HYD_STDIN, NULL,
- HYD_UII_mpx_stdin_cb);
+ status = HYD_DMX_register_fd(1, &proxy->in, HYD_STDIN, NULL, HYD_UII_mpx_stdin_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
}
@@ -274,8 +275,9 @@
for (i = 0; i < proc_count; i++) {
if (HYD_handle.print_all_exitcodes) {
HYDU_dump(stdout, "[%d]", HYDU_local_to_global_id(i, proxy->proxy_core_count,
- proxy->segment_list,
- HYD_handle.global_core_count));
+ proxy->segment_list,
+ HYD_handle.
+ global_core_count));
HYDU_dump(stdout, "%d", WEXITSTATUS(proxy->exit_status[i]));
if (i < proc_count - 1)
HYDU_dump(stdout, ",");
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -193,7 +193,7 @@
proxy->segment_list->start_pid = pid;
proxy->segment_list->proc_count = num_procs;
}
- else { /* hostname matches */
+ else { /* hostname matches */
for (segment = proxy->segment_list; segment->next; segment = segment->next);
/* If this segment is a continuation, just increment the
@@ -229,7 +229,7 @@
char *hostname, *procs;
HYD_Status status = HYD_SUCCESS;
- if (newline) { /* The first entry gives the hostname and processes */
+ if (newline) { /* The first entry gives the hostname and processes */
hostname = strtok(token, ":");
procs = strtok(NULL, ":");
num_procs = procs ? atoi(procs) : 1;
@@ -237,7 +237,7 @@
status = HYD_UII_mpx_add_to_proxy_list(hostname, num_procs);
HYDU_ERR_POP(status, "unable to initialize proxy\n");
}
- else { /* Not a new line */
+ else { /* Not a new line */
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR,
"token %s not supported at this time\n", token);
}
Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -123,8 +123,7 @@
static HYD_Status add_exec_info_to_proxy(struct HYD_Exec_info *exec_info,
- struct HYD_Proxy *proxy,
- int num_procs)
+ struct HYD_Proxy *proxy, int num_procs)
{
int i;
struct HYD_Proxy_exec *exec;
Modified: mpich2/trunk/src/pm/hydra/utils/args/args.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/args/args.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/args/args.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -146,10 +146,10 @@
retval = cwdval;
}
-fn_exit:
+ fn_exit:
return retval;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
Modified: mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -13,7 +13,7 @@
#include "plpa.h"
#include "plpa_internal.h"
-HYD_Status HYDU_bind_plpa_init(HYDU_bind_support_level_t *support_level)
+HYD_Status HYDU_bind_plpa_init(HYDU_bind_support_level_t * support_level)
{
PLPA_NAME(api_type_t) p;
int ret, i, j, max, id;
Modified: mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.h
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -7,7 +7,7 @@
#ifndef BIND_PLPA_H_INCLUDED
#define BIND_PLPA_H_INCLUDED
-HYD_Status HYDU_bind_plpa_init(HYDU_bind_support_level_t *support_level);
+HYD_Status HYDU_bind_plpa_init(HYDU_bind_support_level_t * support_level);
HYD_Status HYDU_bind_plpa_process(int core);
#endif /* BIND_PLPA_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -9,30 +9,30 @@
#include "ckpoint_blcr.h"
#include <libcr.h>
-static int my_callback(void* arg)
+static int my_callback(void *arg)
{
int rc;
rc = cr_checkpoint(CR_CHECKPOINT_OMIT);
- switch(rc) {
- case -CR_ETEMPFAIL :
+ switch (rc) {
+ case -CR_ETEMPFAIL:
/* One of the processes indicated that it couldn't take the checkpoint now. Try again later. */
return -1;
break;
- case -CR_EPERMFAIL :
+ case -CR_EPERMFAIL:
/* One of the processes indicated a permanent failure */
return -1;
break;
- case -CR_EOMITTED :
+ case -CR_EOMITTED:
/* This is the expected return */
break;
default:
/* Something bad happened */
return -1;
}
-
-
+
+
return 0;
}
@@ -42,24 +42,27 @@
char filename[256];
int ret;
- snprintf(filename, sizeof(filename), fname_template, (int)getpid(), rank);
-
+ snprintf(filename, sizeof(filename), fname_template, (int) getpid(), rank);
+
ret = mkfifo(filename, 0600);
- HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "mkfifo failed: %s\n", strerror(errno));
-
+ HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "mkfifo failed: %s\n",
+ strerror(errno));
+
*fd = open(filename, O_RDWR);
- HYDU_ERR_CHKANDJUMP1(status, *fd < 0, HYD_INTERNAL_ERROR, "open failed: %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, *fd < 0, HYD_INTERNAL_ERROR, "open failed: %s\n",
+ strerror(errno));
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-
-fn_fail:
+
+ fn_fail:
goto fn_exit;
}
-static HYD_Status create_stdinouterr_fifos(int num_ranks, int ranks[], int *in, int *out, int *err)
+static HYD_Status create_stdinouterr_fifos(int num_ranks, int ranks[], int *in, int *out,
+ int *err)
{
HYD_Status status = HYD_SUCCESS;
int r;
@@ -67,28 +70,31 @@
for (r = 0; r < num_ranks; ++r) {
if (in && ranks[r] == 0) {
status = create_fifo("/tmp/hydra-in-%d:%d", ranks[r], in);
- if (status) HYDU_ERR_POP(status, "create in fifo\n");
+ if (status)
+ HYDU_ERR_POP(status, "create in fifo\n");
}
if (out) {
status = create_fifo("/tmp/hydra-out-%d:%d", ranks[r], &out[r]);
- if (status) HYDU_ERR_POP(status, "create out fifo\n");
+ if (status)
+ HYDU_ERR_POP(status, "create out fifo\n");
}
if (err) {
status = create_fifo("/tmp/hydra-err-%d:%d", ranks[r], &err[r]);
- if (status) HYDU_ERR_POP(status, "create err fifo\n");
+ if (status)
+ HYDU_ERR_POP(status, "create err fifo\n");
}
}
-
-fn_exit:
+
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-
-fn_fail:
+
+ fn_fail:
goto fn_exit;
}
-static HYD_Status create_env_file(const HYD_Env_t *envlist, int num_ranks, int *ranks)
+static HYD_Status create_env_file(const HYD_Env_t * envlist, int num_ranks, int *ranks)
{
HYD_Status status = HYD_SUCCESS;
char filename[256];
@@ -96,28 +102,31 @@
const HYD_Env_t *e;
int ret;
int r;
-
+
HYDU_FUNC_ENTER();
for (r = 0; r < num_ranks; ++r) {
- snprintf(filename, sizeof(filename), "/tmp/hydra-env-file-%d:%d", (int)getpid(), ranks[r]);
-
+ snprintf(filename, sizeof(filename), "/tmp/hydra-env-file-%d:%d", (int) getpid(),
+ ranks[r]);
+
f = fopen(filename, "w");
- HYDU_ERR_CHKANDJUMP1(status, f == NULL, HYD_INTERNAL_ERROR, "fopen failed: %s\n", strerror(errno));
-
+ HYDU_ERR_CHKANDJUMP1(status, f == NULL, HYD_INTERNAL_ERROR, "fopen failed: %s\n",
+ strerror(errno));
+
for (e = envlist; e; e = e->next) {
fprintf(f, "%s=%s\n", e->env_name, e->env_value);
}
-
+
ret = fclose(f);
- HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "fclose failed: %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "fclose failed: %s\n",
+ strerror(errno));
}
-
-fn_exit:
+
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-
-fn_fail:
+
+ fn_fail:
goto fn_exit;
}
@@ -136,11 +145,12 @@
snprintf(filename, sizeof(filename), "%s/context", prefix);
/* remove existing checkpoint file, if any */
- (void)unlink(filename);
-
+ (void) unlink(filename);
+
/* open the checkpoint file */
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC /* | O_LARGEFILE */, 0600);
- HYDU_ERR_CHKANDJUMP1(status, fd < 0, HYD_INTERNAL_ERROR, "open failed: %s\n", strerror(errno));
+ fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC /* | O_LARGEFILE */ , 0600);
+ HYDU_ERR_CHKANDJUMP1(status, fd < 0, HYD_INTERNAL_ERROR, "open failed: %s\n",
+ strerror(errno));
cr_initialize_checkpoint_args_t(&my_args);
my_args.cr_fd = fd;
@@ -149,39 +159,50 @@
/* issue the request */
ret = cr_request_checkpoint(&my_args, &my_handle);
if (ret < 0) {
- HYDU_ERR_CHKANDJUMP1(status, errno == CR_ENOSUPPORT, HYD_INTERNAL_ERROR, "cr_request_checkpoint failed, %s\n", strerror(errno));
- HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "cr_request_checkpoint failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, errno == CR_ENOSUPPORT, HYD_INTERNAL_ERROR,
+ "cr_request_checkpoint failed, %s\n", strerror(errno));
+ HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "cr_request_checkpoint failed, %s\n",
+ strerror(errno));
}
/* wait for the request to complete */
while (0) {
ret = cr_poll_checkpoint(&my_handle, NULL);
if (ret < 0) {
if ((ret == CR_POLL_CHKPT_ERR_POST) && (errno == CR_ERESTARTED)) {
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "trying to restart in a checkpoint\n");
- } else if (errno == EINTR) {
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
+ "trying to restart in a checkpoint\n");
+ }
+ else if (errno == EINTR) {
/* poll was interrupted by a signal -- retry */
- } else {
- HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR, "cr_poll_checkpoint failed: %s\n", strerror(errno));
}
- } else if (ret == 0) {
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "cr_poll_checkpoint returned 0 unexpectedly\n");
- } else {
+ else {
+ HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR,
+ "cr_poll_checkpoint failed: %s\n", strerror(errno));
+ }
+ }
+ else if (ret == 0) {
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
+ "cr_poll_checkpoint returned 0 unexpectedly\n");
+ }
+ else {
break;
- }
+ }
}
ret = close(my_args.cr_fd);
- HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "close failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "close failed, %s\n",
+ strerror(errno));
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
-HYD_Status HYDU_ckpoint_blcr_restart(const char *prefix, HYD_Env_t *envlist, int num_ranks, int ranks[], int *in, int *out, int *err)
+HYD_Status HYDU_ckpoint_blcr_restart(const char *prefix, HYD_Env_t * envlist, int num_ranks,
+ int ranks[], int *in, int *out, int *err)
{
HYD_Status status = HYD_SUCCESS;
pid_t mypid;
@@ -190,39 +211,44 @@
cr_restart_handle_t cr_handle;
cr_restart_args_t args;
char filename[256];
-
+
HYDU_FUNC_ENTER();
mypid = getpid();
status = create_env_file(envlist, num_ranks, ranks);
- if (status) HYDU_ERR_POP(status, "blcr restart\n");
+ if (status)
+ HYDU_ERR_POP(status, "blcr restart\n");
status = create_stdinouterr_fifos(num_ranks, ranks, in, out, err);
- if (status) HYDU_ERR_POP(status, "blcr restart\n");
+ if (status)
+ HYDU_ERR_POP(status, "blcr restart\n");
snprintf(filename, sizeof(filename), "%s/context", prefix);
-
+
context_fd = open(filename, O_RDONLY /* | O_LARGEFILE */);
- HYDU_ERR_CHKANDJUMP1(status, context_fd < 0, HYD_INTERNAL_ERROR, "open failed, %s\n", strerror(errno));
-
+ HYDU_ERR_CHKANDJUMP1(status, context_fd < 0, HYD_INTERNAL_ERROR, "open failed, %s\n",
+ strerror(errno));
+
/* ... initialize the request structure */
cr_initialize_restart_args_t(&args);
- args.cr_fd = context_fd;
- args.cr_flags = CR_RSTRT_RESTORE_PID;
+ args.cr_fd = context_fd;
+ args.cr_flags = CR_RSTRT_RESTORE_PID;
/* ... issue the request */
ret = cr_request_restart(&args, &cr_handle);
- HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "cr_request_restart failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "cr_request_restart failed, %s\n",
+ strerror(errno));
ret = close(context_fd);
- HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "close failed, %s\n", strerror(errno));
+ HYDU_ERR_CHKANDJUMP1(status, ret, HYD_INTERNAL_ERROR, "close failed, %s\n",
+ strerror(errno));
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
@@ -232,20 +258,21 @@
int rc;
cr_client_id_t client_id;
cr_callback_id_t callback_id;
-
+
HYDU_FUNC_ENTER();
-
- client_id = (int)cr_init();
- if (client_id < 0) goto fn_fail;
+ client_id = (int) cr_init();
+ if (client_id < 0)
+ goto fn_fail;
+
callback_id = cr_register_callback(my_callback, &rc, CR_SIGNAL_CONTEXT);
- if (callback_id < 0) goto fn_fail;
+ if (callback_id < 0)
+ goto fn_fail;
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-
-fn_fail:
+
+ fn_fail:
goto fn_exit;
}
-
Modified: mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.h
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.h 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/ckpoint/blcr/ckpoint_blcr.h 2009-10-14 12:10:26 UTC (rev 5461)
@@ -9,6 +9,7 @@
HYD_Status HYDU_ckpoint_blcr_init(void);
HYD_Status HYDU_ckpoint_blcr_suspend(const char *prefix);
-HYD_Status HYDU_ckpoint_blcr_restart(const char *prefix, HYD_Env_t *envlist, int num_ranks, int ranks[], int *in, int *out, int *err);
+HYD_Status HYDU_ckpoint_blcr_restart(const char *prefix, HYD_Env_t * envlist, int num_ranks,
+ int ranks[], int *in, int *out, int *err);
#endif /* CKPOINT_BLCR_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/utils/ckpoint/ckpoint.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/ckpoint/ckpoint.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/ckpoint/ckpoint.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -32,11 +32,11 @@
}
#endif /* HAVE_BLCR */
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
@@ -46,8 +46,9 @@
HYDU_FUNC_ENTER();
- HYDU_ERR_CHKANDJUMP(status, HYDU_ckpoint_info.ckpoint_prefix == NULL, HYD_INTERNAL_ERROR, "no checkpoint prefix defined\n");
-
+ HYDU_ERR_CHKANDJUMP(status, HYDU_ckpoint_info.ckpoint_prefix == NULL, HYD_INTERNAL_ERROR,
+ "no checkpoint prefix defined\n");
+
#if defined HAVE_BLCR
if (!strcmp(HYDU_ckpoint_info.ckpointlib, "blcr")) {
status = HYDU_ckpoint_blcr_suspend(HYDU_ckpoint_info.ckpoint_prefix);
@@ -55,33 +56,37 @@
}
#endif /* HAVE_BLCR */
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
-HYD_Status HYDU_ckpoint_restart(HYD_Env_t *envlist, int num_ranks, int ranks[], int *in, int *out, int *err)
+HYD_Status HYDU_ckpoint_restart(HYD_Env_t * envlist, int num_ranks, int ranks[], int *in,
+ int *out, int *err)
{
HYD_Status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- HYDU_ERR_CHKANDJUMP(status, HYDU_ckpoint_info.ckpoint_prefix == NULL, HYD_INTERNAL_ERROR, "no checkpoint prefix defined\n");
+ HYDU_ERR_CHKANDJUMP(status, HYDU_ckpoint_info.ckpoint_prefix == NULL, HYD_INTERNAL_ERROR,
+ "no checkpoint prefix defined\n");
#if defined HAVE_BLCR
if (!strcmp(HYDU_ckpoint_info.ckpointlib, "blcr")) {
- status = HYDU_ckpoint_blcr_restart(HYDU_ckpoint_info.ckpoint_prefix, envlist, num_ranks, ranks, in, out, err);
+ status =
+ HYDU_ckpoint_blcr_restart(HYDU_ckpoint_info.ckpoint_prefix, envlist, num_ranks,
+ ranks, in, out, err);
HYDU_ERR_POP(status, "blcr checkpoint returned error\n");
}
#endif /* HAVE_BLCR */
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
Modified: mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -8,13 +8,13 @@
static char *dbg_prefix = (char *) "unknown";
-void HYDU_dump_prefix(FILE *fp)
+void HYDU_dump_prefix(FILE * fp)
{
fprintf(fp, "[%s] ", dbg_prefix);
fflush(fp);
}
-void HYDU_dump_noprefix(FILE *fp, const char *str, ...)
+void HYDU_dump_noprefix(FILE * fp, const char *str, ...)
{
va_list list;
@@ -24,7 +24,7 @@
va_end(list);
}
-void HYDU_dump(FILE *fp, const char *str, ...)
+void HYDU_dump(FILE * fp, const char *str, ...)
{
va_list list;
@@ -45,8 +45,7 @@
"gethostname error (hostname: %s; errno: %d)\n", hostname, errno);
HYDU_MALLOC(dbg_prefix, char *, strlen(hostname) + 1 + strlen(str) + 1, status);
- HYDU_snprintf(dbg_prefix, strlen(hostname) + 1 + strlen(str) + 1,
- "%s@%s", str, hostname);
+ HYDU_snprintf(dbg_prefix, strlen(hostname) + 1 + strlen(str) + 1, "%s@%s", str, hostname);
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/utils/env/env.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/env/env.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/env/env.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -37,7 +37,7 @@
}
-HYD_Status HYDU_str_to_env(char *str, HYD_Env_t **env)
+HYD_Status HYDU_str_to_env(char *str, HYD_Env_t ** env)
{
char *env_name, *env_value;
HYD_Status status = HYD_SUCCESS;
Modified: mpich2/trunk/src/pm/hydra/utils/others/others.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/others/others.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/others/others.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -7,7 +7,7 @@
#include "hydra_utils.h"
HYD_Status HYDU_merge_proxy_segment(char *hostname, struct HYD_Proxy_segment *segment,
- struct HYD_Proxy **proxy_list)
+ struct HYD_Proxy **proxy_list)
{
struct HYD_Proxy *proxy;
struct HYD_Proxy_segment *s;
Modified: mpich2/trunk/src/pm/hydra/utils/sock/sock.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2009-10-14 12:03:14 UTC (rev 5460)
+++ mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2009-10-14 12:10:26 UTC (rev 5461)
@@ -259,7 +259,7 @@
*count = 0;
while (1) {
do {
- tmp = read(fd, (char *)buf + *count, maxlen - *count);
+ tmp = read(fd, (char *) buf + *count, maxlen - *count);
} while (tmp < 0 && errno == EINTR);
if (tmp < 0) {
More information about the mpich2-commits
mailing list