From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 12 Feb 2013 15:06:13 +0000 (+0100)
Subject: Reindent.
X-Git-Tag: v3_9_90~494^2~11
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e7d63af354e1227ed78d115a6432d5c588693a72

Reindent.
---

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 650f46b336..f618fdf95a 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -747,14 +747,14 @@ double simcall_comm_change_rate_first_action(smx_rdv_t rdv, double newrate)
 
   item = xbt_fifo_get_first_item(rdv->comm_fifo);
   if (item != NULL) {
-	  action = (smx_action_t) xbt_fifo_get_item_content(item);
-	  if (action->comm.rate > newrate) {
-		  action->comm.rate = newrate;
-		  return newrate;
-	  } else
-		  return action->comm.rate;
+    action = (smx_action_t) xbt_fifo_get_item_content(item);
+    if (action->comm.rate > newrate) {
+      action->comm.rate = newrate;
+      return newrate;
+    } else
+      return action->comm.rate;
   } else
-	  return -1.0;
+    return -1.0;
 }
 
 
diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index 3ba6ccc051..215444828f 100644
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -75,103 +75,67 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes,
 
   /* create the router */
   char *link_name =
-		  ((sg_routing_edge_t) ((as_cluster_t) rc)->router)->name;
+    ((sg_routing_edge_t) ((as_cluster_t) rc)->router)->name;
   routerNode = new_xbt_graph_node(graph, link_name, nodes);
 
   if(((as_cluster_t) rc)->backbone) {
-	  char *link_nameR =
-			  ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
-	  backboneNode = new_xbt_graph_node(graph, link_nameR, nodes);
+    char *link_nameR =
+      ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
+    backboneNode = new_xbt_graph_node(graph, link_nameR, nodes);
 
-	  new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
+    new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
   }
 
   for (isrc = 0; isrc < table_size; isrc++) {
-	  src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
-
-	  if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {
-			  previous = new_xbt_graph_node(graph, src->name, nodes);
+    src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
 
-			  info = xbt_dynar_get_as(rc->link_up_down_list, src->id,
-					  s_surf_parsing_link_up_down_t);
+    if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {
+      previous = new_xbt_graph_node(graph, src->name, nodes);
 
-			  if (info.link_up) {     // link up
+      info = xbt_dynar_get_as(rc->link_up_down_list, src->id,
+                              s_surf_parsing_link_up_down_t);
 
-				  char *link_name = ((surf_resource_t) info.link_up)->name;
-				  current = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, previous, current, edges);
+      if (info.link_up) {     // link up
 
-				  if (((as_cluster_t) rc)->backbone) {
-					  new_xbt_graph_edge(graph, current, backboneNode, edges);
-				  } else {
-					  new_xbt_graph_edge(graph, current, routerNode, edges);
-				  }
+        char *link_name = ((surf_resource_t) info.link_up)->name;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, previous, current, edges);
 
-			  }
+        if (((as_cluster_t) rc)->backbone) {
+          new_xbt_graph_edge(graph, current, backboneNode, edges);
+        } else {
+          new_xbt_graph_edge(graph, current, routerNode, edges);
+        }
 
-			  if (info.link_down) {    // link down
-				  char *link_name = ((surf_resource_t) info.link_down)->name;
-				  current = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, previous, current, edges);
+      }
 
-				  if (((as_cluster_t) rc)->backbone) {
-					  new_xbt_graph_edge(graph, current, backboneNode, edges);
-				  } else {
-					  new_xbt_graph_edge(graph, current, routerNode, edges);
-				  }
+      if (info.link_down) {    // link down
+        char *link_name = ((surf_resource_t) info.link_down)->name;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, previous, current, edges);
 
-			  }
-		  }
-  }
+        if (((as_cluster_t) rc)->backbone) {
+          new_xbt_graph_edge(graph, current, backboneNode, edges);
+        } else {
+          new_xbt_graph_edge(graph, current, routerNode, edges);
+        }
 
+      }
 /*
-		  if (((as_cluster_t) rc)->backbone) {
-			  char *link_name =
-					  ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
-
-			  current = new_xbt_graph_node(graph, link_name, nodes);
-			  new_xbt_graph_edge(graph, previous, current, edges);
-			  previous = current;
-
-			  revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-			  new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-			  revPrevious = revCurrent;
-		  } else {
-			  info = xbt_dynar_get_as(rc->link_up_down_list, dst->id,
-			 						  s_surf_parsing_link_up_down_t);
-
-			  if (info.link_up) {     // link up
-				  char *link_name = ((surf_resource_t) info.link_up)->name;
-				  current = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, previous, current, edges);
-				  previous = current;
-			  } else if (info.link_down) {    // link down
-				  char *link_name = ((surf_resource_t) info.link_down)->name;
-				  revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-				  revPrevious = revCurrent;
-			  }
-		  }
-
-	  }
-  }*/
-/*
-  if(rc->)
-  for (isrc = 0; isrc < table_size; isrc++) {
-    src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
-
-    previous = new_xbt_graph_node(graph, src->name, nodes);
-    revPrevious = new_xbt_graph_node(graph, src->name, nodes);
-
-    for (idst = isrc + 1; idst < table_size; idst++) {
-      dst = xbt_dynar_get_as(rc->index_network_elm, idst, sg_routing_edge_t);
+      if (((as_cluster_t) rc)->backbone) {
+        char *link_name =
+          ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
 
-      s_surf_parsing_link_up_down_t info;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, previous, current, edges);
+        previous = current;
 
-      if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
-        info =
-            xbt_dynar_get_as(rc->link_up_down_list, src->id,
-                             s_surf_parsing_link_up_down_t);
+        revCurrent = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
+        revPrevious = revCurrent;
+      } else {
+        info = xbt_dynar_get_as(rc->link_up_down_list, dst->id,
+                                s_surf_parsing_link_up_down_t);
 
         if (info.link_up) {     // link up
           char *link_name = ((surf_resource_t) info.link_up)->name;
@@ -185,42 +149,76 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes,
           revPrevious = revCurrent;
         }
       }
+*/
+    }
+  }
+/*
+  if(rc->)
+    for (isrc = 0; isrc < table_size; isrc++) {
+      src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
 
+      previous = new_xbt_graph_node(graph, src->name, nodes);
+      revPrevious = new_xbt_graph_node(graph, src->name, nodes);
 
+      for (idst = isrc + 1; idst < table_size; idst++) {
+        dst = xbt_dynar_get_as(rc->index_network_elm, idst, sg_routing_edge_t);
 
-      if (((as_cluster_t) rc)->backbone) {
-        char *link_name =
-            ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
+        s_surf_parsing_link_up_down_t info;
 
-        current = new_xbt_graph_node(graph, link_name, nodes);
-        new_xbt_graph_edge(graph, previous, current, edges);
-        previous = current;
+        if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
+          info =
+            xbt_dynar_get_as(rc->link_up_down_list, src->id,
+                             s_surf_parsing_link_up_down_t);
 
-        revCurrent = new_xbt_graph_node(graph, link_name, nodes);
-        new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
-        revPrevious = revCurrent;
-      }
+          if (info.link_up) {     // link up
+            char *link_name = ((surf_resource_t) info.link_up)->name;
+            current = new_xbt_graph_node(graph, link_name, nodes);
+            new_xbt_graph_edge(graph, previous, current, edges);
+            previous = current;
+          } else if (info.link_down) {    // link down
+            char *link_name = ((surf_resource_t) info.link_down)->name;
+            revCurrent = new_xbt_graph_node(graph, link_name, nodes);
+            new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
+            revPrevious = revCurrent;
+          }
+        }
 
-      if (dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
-        info =
-            xbt_dynar_get_as(rc->link_up_down_list, dst->id,
-                             s_surf_parsing_link_up_down_t);
 
-        if (info.link_up) {     // link up
-          char *link_name = ((surf_resource_t) info.link_up)->name;
+
+        if (((as_cluster_t) rc)->backbone) {
+          char *link_name =
+            ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
+
           current = new_xbt_graph_node(graph, link_name, nodes);
           new_xbt_graph_edge(graph, previous, current, edges);
           previous = current;
-        } else if (info.link_down) {    // link down
-          char *link_name = ((surf_resource_t) info.link_down)->name;
+
           revCurrent = new_xbt_graph_node(graph, link_name, nodes);
           new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
           revPrevious = revCurrent;
         }
-      }
 
+        if (dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {        // No specific link for router
+          info =
+            xbt_dynar_get_as(rc->link_up_down_list, dst->id,
+                             s_surf_parsing_link_up_down_t);
+
+          if (info.link_up) {     // link up
+            char *link_name = ((surf_resource_t) info.link_up)->name;
+            current = new_xbt_graph_node(graph, link_name, nodes);
+            new_xbt_graph_edge(graph, previous, current, edges);
+            previous = current;
+          } else if (info.link_down) {    // link down
+            char *link_name = ((surf_resource_t) info.link_down)->name;
+            revCurrent = new_xbt_graph_node(graph, link_name, nodes);
+            new_xbt_graph_edge(graph, revCurrent, revPrevious, edges);
+            revPrevious = revCurrent;
+          }
+        }
+
+      }
     }
-  }*/
+*/
 }
 
 static void model_cluster_finalize(AS_t as)