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;
}
}
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,
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);
}
else link_new(name, bw, lat, current_property_set);
+ current_property_set = NULL;
}
/* Create the gtnets topology based on routing strategy */
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);
}
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");
xbt_swag_t running_actions =
surf_network_model->states.running_action_set;
- /* If there are no renning flows, just return */
+ /* If there are no running flows, just return */
if (time_to_next_flow_completion < 0.0) {
return;
}
action->generic_action.remains);
double sent = gtnets_get_flow_rx(action);
+ XBT_DEBUG("Sent value returned by GTNetS : %f", sent);
+
#ifdef HAVE_TRACING
- double trace_sent = sent;
- if (trace_sent == 0) {
- //if sent is equals to 0, means that gtnets sent all the bytes
- 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);
-// }
-// }
+ action->last_remains = action->generic_action.remains;
#endif
- XBT_DEBUG("Sent value returned by GTNetS : %f", sent);
- //need to trust this remain value
- if (sent == 0) {
- action->generic_action.remains = 0;
+ //need to trust this remain value
+ if (sent == 0) {
+ action->generic_action.remains = 0;
} else {
action->generic_action.remains =
action->generic_action.cost - sent;
}
- XBT_DEBUG("Action (%p) remains new value: %f", action,
+
+ // verify that this action is a finishing action.
+ int found=0;
+ for (i = 0; i < num_flows; i++) {
+ if(action == (surf_action_network_GTNETS_t) (metadata[i])){
+ found = 1;
+ break;
+ }
+ }
+
+ // indeed this action have not yet started
+ // because of that we need to fix the remaining to the
+ // original total cost
+ if(found != 1 && action->generic_action.remains == 0 ){
+ action->generic_action.remains = action->generic_action.cost;
+ }
+
+ XBT_DEBUG("Action (%p) remains new value: %f", action,
action->generic_action.remains);
+
+#ifdef HAVE_TRACING
+ if (TRACE_is_enabled()) {
+ double last_amount_sent = (action->generic_action.cost - action->last_remains);
+ double amount_sent = (action->generic_action.cost - action->generic_action.remains);
+
+ // tracing resource utilization
+ 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,
+ (amount_sent - last_amount_sent)/(delta),
+ now-delta,
+ delta);
+ }
+ }
+#endif
+
+
}
for (i = 0; i < num_flows; i++) {
action = (surf_action_network_GTNETS_t) (metadata[i]);
+
+
action->generic_action.finish = now + time_to_next_flow_completion;
+ action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+ XBT_DEBUG("----> Action (%p) just terminated", action);
+
#ifdef HAVE_TRACING
TRACE_surf_gtnets_destroy(action);
#endif
- action_state_set((surf_action_t) action, SURF_ACTION_DONE);
- XBT_DEBUG("----> Action (%p) just terminated", action);
}
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,
surf_action_new(sizeof(s_surf_action_network_GTNETS_t), size,
surf_network_model, 0);
+#ifdef HAVE_TRACING
+ action->last_remains = 0;
+#endif
+
/* Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
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;
}
#endif
-#ifdef HAVE_GTNETS
void surf_network_model_init_GTNETS(const char *filename)
{
if (surf_network_model)
update_model_description(surf_network_model_description,
"GTNets", surf_network_model);
}
-#endif
