Add FindNS3 module to cmake.

[simgrid.git] / src / surf / network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 6564fb5..798320b 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -23,7 +23,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   static int link_count = -1;
   network_link_GTNETS_t gtnets_link;
 
-  if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
+  if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) {
     return;
   }
 
@@ -46,8 +46,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   }
   gtnets_link->id = link_count;
 
-  xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
-               surf_resource_free);
+  xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link);
 }
 
 static void route_new(int src_id, int dst_id, xbt_dynar_t links,
@@ -110,7 +109,6 @@ static void parse_link_init(void)
   if (state_trace)
     XBT_INFO("The GTNetS network model doesn't support link state traces");
 
-  current_property_set = xbt_dict_new();
   if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
   {
          link_new(bprintf("%s_UP",name), bw, lat, current_property_set);
@@ -118,6 +116,7 @@ static void parse_link_init(void)
 
   }
   else  link_new(name, bw, lat, current_property_set);
+  current_property_set = NULL;
 }
 
 /* Create the gtnets topology based on routing strategy */
@@ -167,7 +166,7 @@ static void create_gtnets_topology()
 static void define_callbacks(const char *file)
 {
   /* Figuring out the network links */
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
+  surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
                        &create_gtnets_topology);
 }
@@ -224,7 +223,7 @@ static double share_resources(double now)
   if (!xbt_swag_size(running_actions))
     return -1.0;
 
-  xbt_assert0(time_to_next_flow_completion,
+  xbt_assert(time_to_next_flow_completion,
               "Time to next flow completion not initialized!\n");
 
   XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion");
@@ -272,18 +271,17 @@ static void update_actions_state(double now, double delta)
         trace_sent = action->generic_action.cost;
       }
       // tracing resource utilization
-// COMMENTED BY DAVID
-//       int src = TRACE_surf_gtnets_get_src (action);
-//       int dst = TRACE_surf_gtnets_get_dst (action);
-//       if (src != -1 && dst != -1){
-//         xbt_dynar_t route = used_routing->get_route(src, dst);
-//         network_link_GTNETS_t link;
-//         unsigned int i;
-//         xbt_dynar_foreach(route, i, link) {
-//              TRACE_surf_link_set_utilization (link->generic_resource.name,
-//             action->generic_action.data, trace_sent/delta, now-delta, delta);
-//         }
-//       }
+      xbt_dynar_t route = global_routing->get_route(action->src_name, action->dst_name);
+      network_link_GTNETS_t link;
+      unsigned int i;
+      xbt_dynar_foreach(route, i, link) {
+        TRACE_surf_link_set_utilization (link->generic_resource.name,
+            action->generic_action.data,
+            (surf_action_t) action,
+            trace_sent/delta,
+            now-delta,
+            delta);
+      }
 #endif
 
       XBT_DEBUG("Sent value returned by GTNetS : %f", sent);
@@ -339,7 +337,7 @@ static surf_action_t communicate(const char *src_name,
 
   src = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src_name));
   dst = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst_name));
-  xbt_assert0((src >= 0
+  xbt_assert((src >= 0
                && dst >= 0), "Either src or dst have invalid id (id<0)");
 
   XBT_DEBUG("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
@@ -357,7 +355,7 @@ static surf_action_t communicate(const char *src_name,
     xbt_die("Not route between host %s and host %s", src_name, dst_name);
   }
 #ifdef HAVE_TRACING
-  TRACE_surf_gtnets_communicate(action, src, dst);
+  TRACE_surf_gtnets_communicate(action, src_name, dst_name);
 #endif
 
   return (surf_action_t) action;
@@ -381,6 +379,13 @@ static int action_is_suspended(surf_action_t action)
   return 0;
 }
 
+#ifdef HAVE_TRACING
+static void gtnets_action_set_category(surf_action_t action, const char *category)
+{
+  action->category = xbt_strdup (category);
+}
+#endif
+
 static void finalize(void)
 {
   gtnets_finalize();
@@ -408,6 +413,9 @@ static void surf_network_model_init_internal(void)
   surf_network_model->suspend = action_suspend;
   surf_network_model->resume = action_resume;
   surf_network_model->is_suspended = action_is_suspended;
+#ifdef HAVE_TRACING
+  surf_network_model->set_category = gtnets_action_set_category;
+#endif
 
   surf_network_model->extension.network.communicate = communicate;