X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ebf7be2320c9239e70924752b5d9833224113ab4..b54b0de1100a656106aa33ebb0afa5f1ead365d4:/src/surf/network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 27eb0cb867..4392bb3330 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ static void link_new(const char *name, double bw, double lat, xbt_dict_t props)
            link_count, name, lat, bw);
 
   if (gtnets_add_link(link_count, bw, lat)) {
-	  xbt_die("Cannot create GTNetS link");
+    xbt_die("Cannot create GTNetS link");
   }
   gtnets_link->id = link_count;
 
@@ -62,7 +62,7 @@ static void route_new(int src_id, int dst_id, xbt_dynar_t links,
           src_id, dst_id, links, nb_link);
 
   /* Build the list of gtnets link IDs */
-  gtnets_links = (int *) calloc(nb_link, sizeof(int));
+  gtnets_links = xbt_new0(int, nb_link);
   i = 0;
   xbt_dynar_foreach(links, cursor, link) {
     gtnets_links[i++] = link->id;
@@ -97,8 +97,8 @@ static void parse_link_init(sg_platf_link_cbarg_t link)
 
   if (link->policy == SURF_LINK_FULLDUPLEX)
   {
-	  link_new(bprintf("%s_UP",link->id), link->bandwidth, link->latency, current_property_set);
-	  link_new(bprintf("%s_DOWN",link->id), link->bandwidth, link->latency, current_property_set);
+    link_new(bprintf("%s_UP",link->id), link->bandwidth, link->latency, current_property_set);
+    link_new(bprintf("%s_DOWN",link->id), link->bandwidth, link->latency, current_property_set);
 
   }
   else  link_new(link->id, link->bandwidth, link->latency, current_property_set);
@@ -132,7 +132,7 @@ static void create_gtnets_topology(void)
          onelink->dst->id);
      XBT_DEBUG("Calling one link route");
         if(onelink->src->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
-        	gtnets_add_router(onelink->src->id);
+          gtnets_add_router(onelink->src->id);
         }
         if(onelink->dst->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
          gtnets_add_router(onelink->dst->id);
@@ -210,7 +210,7 @@ static double share_resources(double now)
 
   XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion");
   time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion();
-  XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %lg",
+  XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %g",
          time_to_next_flow_completion);
 
   return time_to_next_flow_completion;