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");
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);
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,
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;
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();
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;