[mpich2-commits] r7940 - in mpich2/trunk/src/pm/hydra: pm/pmiserv tools/bootstrap/include tools/bootstrap/src

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-02-11 17:34:19 -0600 (Fri, 11 Feb 2011)
New Revision: 7940

Modified:
   mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h
   mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
   mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h
   mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
Log:
White space cleanup.

No reviewer.

Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h	2011-02-11 23:34:14 UTC (rev 7939)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h	2011-02-11 23:34:19 UTC (rev 7940)
@@ -21,7 +21,7 @@
 };
 
 struct HYD_pmcd_pmi_kvs {
-    char kvs_name[PMI_MAXKVSLEN];  /* Name of this kvs */
+    char kvs_name[PMI_MAXKVSLEN];       /* Name of this kvs */
     struct HYD_pmcd_pmi_kvs_pair *key_pair;
 };
 

Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c	2011-02-11 23:34:14 UTC (rev 7939)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c	2011-02-11 23:34:19 UTC (rev 7940)
@@ -355,7 +355,8 @@
                         if (e->start == e->end)
                             HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d", str, e->start);
                         else
-                            HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d-%d", str, e->start, e->end);
+                            HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d-%d", str, e->start,
+                                          e->end);
                     }
                     else {
                         if (e->start == e->end)

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h	2011-02-11 23:34:14 UTC (rev 7939)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h	2011-02-11 23:34:19 UTC (rev 7940)
@@ -27,10 +27,10 @@
     const char *launcher_exec;
 
     /** \brief Enable/disable X-forwarding */
-    int  enablex;
+    int enablex;
 
     /** \brief Enable/disable debugging */
-    int  debug;
+    int debug;
 };
 
 /**
@@ -43,7 +43,7 @@
     HYD_status(*query_native_int) (int *ret);
 
     /** \brief Query for node list information */
-    HYD_status(*query_node_list) (struct HYD_node **node_list);
+    HYD_status(*query_node_list) (struct HYD_node ** node_list);
 
     /** \brief Query for job ID information */
     HYD_status(*query_jobid) (char **jobid);
@@ -54,7 +54,7 @@
 
     /* Launcher functions */
     /** \brief Launch processes */
-    HYD_status(*launch_procs) (char **args, struct HYD_node *node_list, int *control_fd);
+    HYD_status(*launch_procs) (char **args, struct HYD_node * node_list, int *control_fd);
 
     /** \brief Finalize the bootstrap control device */
     HYD_status(*launcher_finalize) (void);
@@ -89,8 +89,7 @@
  * pointers in this function to be used by later BSCI calls.
  */
 HYD_status HYDT_bsci_init(const char *rmk, const char *launcher,
-                          const char *launcher_exec, int enablex,
-                          int debug);
+                          const char *launcher_exec, int enablex, int debug);
 
 
 /**

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in	2011-02-11 23:34:14 UTC (rev 7939)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in	2011-02-11 23:34:19 UTC (rev 7940)
@@ -11,10 +11,12 @@
 struct HYDT_bsci_fns HYDT_bsci_fns = { 0 };
 struct HYDT_bsci_info HYDT_bsci_info = { 0 };
 
+/* *INDENT-OFF* */
 static const char *launcher_array[] = { @hydra_launcher_array@ };
 static const char *rmk_array[] = { @hydra_rmk_array@ };
 static HYD_status(*launcher_init_array[])(void) = { @hydra_launcher_init_array@ };
 static HYD_status(*rmk_init_array[])(void) = { @hydra_rmk_init_array@ };
+/* *INDENT-ON* */
 
 static void init_rmk_fns(void)
 {
@@ -53,7 +55,7 @@
         HYDT_bsci_info.rmk = HYDU_strdup(rmk_array[i]);
         HYDT_bsci_info.debug = debug;
 
-        status = (*rmk_init_array[i])();
+        status = (*rmk_init_array[i]) ();
         HYDU_ERR_POP(status, "bootstrap device returned error initializing\n");
 
         status = HYDT_bsci_query_native_int(&ret);
@@ -136,7 +138,7 @@
     /* Initialize the RMK */
     for (i = 0; rmk_array[i]; i++) {
         if (!strcmp(HYDT_bsci_info.rmk, rmk_array[i])) {
-            status = (*rmk_init_array[i])();
+            status = (*rmk_init_array[i]) ();
             HYDU_ERR_POP(status, "RMK init returned error\n");
             break;
         }
@@ -166,7 +168,7 @@
     /* Make sure the launcher we found is valid */
     for (i = 0; launcher_array[i]; i++) {
         if (!strcmp(HYDT_bsci_info.launcher, launcher_array[i])) {
-            status = (*launcher_init_array[i])();
+            status = (*launcher_init_array[i]) ();
             HYDU_ERR_POP(status, "launcher init returned error\n");
             break;
         }