[mpich2-commits] r7514 - in mpich2/trunk/src/pm/hydra: tools/bind tools/bind/hwloc tools/demux ui/mpich

[balaji at mcs.anl.gov]

Author: balaji
Date: 2010-11-29 02:03:48 -0600 (Mon, 29 Nov 2010)
New Revision: 7514

Modified:
   mpich2/trunk/src/pm/hydra/tools/bind/bind.c
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
   mpich2/trunk/src/pm/hydra/tools/demux/demux.c
   mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
Log:
White space cleanup.

Modified: mpich2/trunk/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2010-11-29 08:03:34 UTC (rev 7513)
+++ mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2010-11-29 08:03:48 UTC (rev 7514)
@@ -177,10 +177,10 @@
             if (use_topo_obj[i])
                 use_topo_obj[i - 1] = 1;
         }
-	/* We should have at least one process on the node; otherwise,
-	   the mapping makes no sense */
-	for (i = HYDT_BIND_OBJ_MACHINE; i < HYDT_BIND_OBJ_NODE; i++)
-	    use_topo_obj[i] = 1;
+        /* We should have at least one process on the node; otherwise,
+         * the mapping makes no sense */
+        for (i = HYDT_BIND_OBJ_MACHINE; i < HYDT_BIND_OBJ_NODE; i++)
+            use_topo_obj[i] = 1;
 
         topo_end = HYDT_BIND_OBJ_END;
         for (i = HYDT_BIND_OBJ_MACHINE; i < HYDT_BIND_OBJ_END; i++) {
@@ -204,7 +204,7 @@
         bindentry = strtok(bindstr, ":");
         bindentry = strtok(NULL, ":");
 
-	/* Don't share any cache to start with */
+        /* Don't share any cache to start with */
         use_cache_level = HYDT_INVALID_CACHE_DEPTH;
         if (bindentry == NULL) {
             /* No extension option specified; use all resources */
@@ -239,10 +239,10 @@
         break_out = 0;
         for (i = HYDT_BIND_OBJ_MACHINE; i < HYDT_BIND_OBJ_END; i++) {
             for (j = 0; j < obj->mem.num_caches; j++) {
-		/* If the cache level is lower than what I'm allowed
-		   to share, and there are more than one OS indices
-		   below this level (there is actually sharing) mark
-		   this as the lowest level I can get to */
+                /* If the cache level is lower than what I'm allowed
+                 * to share, and there are more than one OS indices
+                 * below this level (there is actually sharing) mark
+                 * this as the lowest level I can get to */
                 if (obj->mem.cache_depth[j] == use_cache_level) {
                     topo_end = (HYDT_bind_obj_type_t) (i + 1);
                     break_out = 1;
@@ -266,8 +266,8 @@
             for (; j < topo_end - 1; j++)
                 obj = obj->children;
 
-	    HYDT_bind_cpuset_dup(obj->cpuset, &HYDT_bind_info.bindmap[i]);
-	    i++;
+            HYDT_bind_cpuset_dup(obj->cpuset, &HYDT_bind_info.bindmap[i]);
+            i++;
 
             child_id = HYDT_BIND_OBJ_CHILD_ID(obj);
             if (child_id < obj->parent->num_children - 1) {

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-11-29 08:03:34 UTC (rev 7513)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-11-29 08:03:48 UTC (rev 7514)
@@ -83,13 +83,13 @@
     obj->mem.num_caches = count_attached_caches(hobj, hobj->cpuset);
 
     if (obj->mem.num_caches) {
-	HYDU_MALLOC(obj->mem.cache_size, size_t *, obj->mem.num_caches * sizeof(size_t),
-		    status);
-	memset(obj->mem.cache_size, 0, obj->mem.num_caches * sizeof(size_t));
-	HYDU_MALLOC(obj->mem.cache_depth, int *, obj->mem.num_caches * sizeof(int), status);
-	memset(obj->mem.cache_depth, 0, obj->mem.num_caches * sizeof(int));
+        HYDU_MALLOC(obj->mem.cache_size, size_t *, obj->mem.num_caches * sizeof(size_t),
+                    status);
+        memset(obj->mem.cache_size, 0, obj->mem.num_caches * sizeof(size_t));
+        HYDU_MALLOC(obj->mem.cache_depth, int *, obj->mem.num_caches * sizeof(int), status);
+        memset(obj->mem.cache_depth, 0, obj->mem.num_caches * sizeof(int));
 
-	gather_attached_caches(obj, hobj, hobj->cpuset, 0);
+        gather_attached_caches(obj, hobj, hobj->cpuset, 0);
     }
 
   fn_exit:

Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/demux/demux.c	2010-11-29 08:03:34 UTC (rev 7513)
+++ mpich2/trunk/src/pm/hydra/tools/demux/demux.c	2010-11-29 08:03:48 UTC (rev 7514)
@@ -10,6 +10,7 @@
 int HYDT_dmxu_num_cb_fds = 0;
 struct HYDT_dmxu_callback *HYDT_dmxu_cb_list = NULL;
 struct HYDT_dmxu_fns HYDT_dmxu_fns = { 0 };
+
 int HYDT_dmxu_got_sigttin = 0;
 
 #if defined(SIGTTIN) && defined(HAVE_ISATTY)

Modified: mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c	2010-11-29 08:03:34 UTC (rev 7513)
+++ mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c	2010-11-29 08:03:48 UTC (rev 7514)
@@ -174,7 +174,7 @@
     HYDU_ERR_POP(status, "unable to initialize FTB\n");
 
 
-    /* Get user preferences*/
+    /* Get user preferences */
     status = HYD_uii_mpx_get_parameters(argv);
     if (status == HYD_GRACEFUL_ABORT) {
         exit(0);