[mpich2-commits] r7710 - in mpich2/trunk/src/pm/hydra: pm/pmiserv tools/bootstrap/src ui/utils
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu Jan 13 05:09:56 CST 2011
Author: balaji
Date: 2011-01-13 05:09:56 -0600 (Thu, 13 Jan 2011)
New Revision: 7710
Modified:
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/bootstrap/src/bsci_launch.c
mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
Log:
White space cleanup.
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2011-01-13 11:09:42 UTC (rev 7709)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2011-01-13 11:09:56 UTC (rev 7710)
@@ -676,8 +676,7 @@
&HYD_pmcd_pmip.downstream.in,
&HYD_pmcd_pmip.downstream.out[process_id],
&HYD_pmcd_pmip.downstream.err[process_id],
- &HYD_pmcd_pmip.downstream.pid[process_id],
- cpuset);
+ &HYD_pmcd_pmip.downstream.pid[process_id], cpuset);
HYDU_ERR_POP(status, "create process returned error\n");
HYDU_free_strlist(client_args);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-01-13 11:09:42 UTC (rev 7709)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-01-13 11:09:56 UTC (rev 7710)
@@ -144,12 +144,13 @@
hdr.cmd = STDIN;
}
else {
- status = HYDU_sock_read(fd, &hdr, sizeof(hdr), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
+ status =
+ HYDU_sock_read(fd, &hdr, sizeof(hdr), &count, &closed, HYDU_SOCK_COMM_MSGWAIT);
HYDU_ERR_POP(status, "unable to read command from proxy\n");
HYDU_ASSERT(!closed, status);
}
- if (hdr.cmd == PID_LIST) { /* Got PIDs */
+ if (hdr.cmd == PID_LIST) { /* 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),
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_launch.c 2011-01-13 11:09:42 UTC (rev 7709)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_launch.c 2011-01-13 11:09:56 UTC (rev 7710)
@@ -7,8 +7,8 @@
#include "hydra.h"
#include "bsci.h"
-HYD_status HYDT_bsci_launch_procs(const char *base_path, char **args, struct HYD_node *node_list,
- int *control_fd)
+HYD_status HYDT_bsci_launch_procs(const char *base_path, char **args,
+ struct HYD_node *node_list, int *control_fd)
{
HYD_status status = HYD_SUCCESS;
Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2011-01-13 11:09:42 UTC (rev 7709)
+++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2011-01-13 11:09:56 UTC (rev 7710)
@@ -171,11 +171,12 @@
return;
}
-static HYD_status resolve_pattern_string(const char *pattern, char **str, int pgid, int proxy_id, int rank)
+static HYD_status resolve_pattern_string(const char *pattern, char **str, int pgid,
+ int proxy_id, int rank)
{
HYD_status status = HYD_SUCCESS;
int i, pos, tpos;
- char *tmp[HYD_NUM_TMP_STRINGS] = {NULL};
+ char *tmp[HYD_NUM_TMP_STRINGS] = { NULL };
struct HYD_pg *pg;
struct HYD_proxy *proxy;
@@ -192,11 +193,11 @@
HYDU_ASSERT(tpos < HYD_TMP_STRLEN, status);
if (pattern[pos] != '%') {
tmp[i][tpos++] = pattern[pos++];
- if (pattern[pos-1] == '\0')
+ if (pattern[pos - 1] == '\0')
break;
}
else {
- ++pos; /* consume '%' */
+ ++pos; /* consume '%' */
if (pattern[pos] == '%') {
tmp[i][tpos++] = pattern[pos++];
@@ -211,35 +212,37 @@
tmp[i][0] = '\0';
switch (pattern[pos]) {
- case 'r':
- MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", rank);
- break;
- case 'g':
- MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", pgid);
- break;
- case 'p':
- MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", proxy_id);
- break;
- case 'h':
- for (pg = &HYD_server_info.pg_list; pg; pg = pg->next)
- if (pg->pgid == pgid)
- break;
- HYDU_ASSERT(pg, status);
+ case 'r':
+ MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", rank);
+ break;
+ case 'g':
+ MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", pgid);
+ break;
+ case 'p':
+ MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%d", proxy_id);
+ break;
+ case 'h':
+ for (pg = &HYD_server_info.pg_list; pg; pg = pg->next)
+ if (pg->pgid == pgid)
+ break;
+ HYDU_ASSERT(pg, status);
- for (proxy = pg->proxy_list; proxy; proxy = proxy->next)
- if (proxy->proxy_id == proxy_id)
- break;
- HYDU_ASSERT(proxy, status);
- MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%s", proxy->node.hostname);
- break;
- case '\0':
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "dangling '%%' at end of pattern\n");
- default:
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "unrecognized pattern specifier ('%c')\n", pattern[pos]);
- break;
+ for (proxy = pg->proxy_list; proxy; proxy = proxy->next)
+ if (proxy->proxy_id == proxy_id)
+ break;
+ HYDU_ASSERT(proxy, status);
+ MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%s", proxy->node.hostname);
+ break;
+ case '\0':
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
+ "dangling '%%' at end of pattern\n");
+ default:
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
+ "unrecognized pattern specifier ('%c')\n", pattern[pos]);
+ break;
}
- ++pos; /* skip past fmt specifier */
+ ++pos; /* skip past fmt specifier */
++i;
tpos = 0;
@@ -313,13 +316,13 @@
}
else {
status = resolve_pattern_string(HYD_ui_info.prepend_pattern, &prepend, pgid, proxy_id,
- rank);
+ rank);
HYDU_ERR_POP(status, "error resolving pattern\n");
mark = 0;
for (i = 0; i < buflen; i++) {
if (buf[i] == '\n' || i == buflen - 1) {
- if (prepend[0] != '\0') { /* sock_write barfs on maxlen==0 */
+ if (prepend[0] != '\0') { /* sock_write barfs on maxlen==0 */
status = HYDU_sock_write(fd, (const void *) prepend,
strlen(prepend), &sent, &closed);
}
More information about the mpich2-commits
mailing list