return;
}
- DEBUG1("Scanning link name %s", name);
+ XBT_DEBUG("Scanning link name %s", name);
gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
link_count++;
- DEBUG4("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
+ XBT_DEBUG("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
link_count, name, lat, bw);
if (gtnets_add_link(link_count, bw, lat)) {
- xbt_assert0(0, "Cannot create GTNetS link");
+ xbt_die("Cannot create GTNetS link");
}
gtnets_link->id = link_count;
int i = 0;
int *gtnets_links;
- XBT_IN4("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
+ XBT_IN("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
src_id, dst_id, links, nb_link);
/* Build the list of gtnets link IDs */
}
if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) {
- xbt_assert0(0, "Cannot create GTNetS route");
+ xbt_die("Cannot create GTNetS route");
}
- XBT_OUT;
+ XBT_OUT();
}
static void route_onehop_new(int src_id, int dst_id,
network_link_GTNETS_t link)
{
if (gtnets_add_onehop_route(src_id, dst_id, link->id)) {
- xbt_assert0(0, "Cannot create GTNetS route");
+ xbt_die("Cannot create GTNetS route");
}
}
surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
surf_parse_get_double(&lat, A_surfxml_link_latency);
state = SURF_RESOURCE_ON;
- DEBUG0("link_gtnets");
+ XBT_DEBUG("link_gtnets");
tmgr_trace_t bw_trace;
tmgr_trace_t state_trace;
tmgr_trace_t lat_trace;
state_trace = tmgr_trace_new(A_surfxml_link_state_file);
if (bw_trace)
- INFO0
+ XBT_INFO
("The GTNetS network model doesn't support bandwidth state traces");
if (lat_trace)
- INFO0("The GTNetS network model doesn't support latency state traces");
+ XBT_INFO("The GTNetS network model doesn't support latency state traces");
if (state_trace)
- INFO0("The GTNetS network model doesn't support link state traces");
+ 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 */
{
int src_id,dst_id;
- DEBUG0("Starting topology generation");
+ XBT_DEBUG("Starting topology generation");
// À refaire plus tard. Il faut prendre la liste des hôtes/routeurs (dans routing)
// À partir de cette liste, on les numérote.
// Ensuite, on peut utiliser les id pour refaire les appels GTNets qui suivent.
dst_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst));
if(src_id != dst_id){
- DEBUG5("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
- DEBUG0("Calling one link route");
+ XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
+ XBT_DEBUG("Calling one link route");
if(global_routing->get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
gtnets_add_router(src_id);
}
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);
}
static int resource_used(void *resource_id)
{
- xbt_assert0(0,
- "The resource_used feature is not implemented in GTNets model");
+ xbt_die("The resource_used feature is not implemented in GTNets model");
}
static int action_unref(surf_action_t action)
if (action->category)
xbt_free(action->category);
#endif
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
static void action_cancel(surf_action_t action)
{
- xbt_assert0(0, "Cannot cancel GTNetS flow");
+ xbt_die("Cannot cancel GTNetS flow");
return;
}
static void action_recycle(surf_action_t action)
{
- xbt_assert0(0, "Cannot recycle GTNetS flow");
+ xbt_die("Cannot recycle GTNetS flow");
return;
}
xbt_assert0(time_to_next_flow_completion,
"Time to next flow completion not initialized!\n");
- DEBUG0("Calling gtnets_get_time_to_next_flow_completion");
+ XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion");
time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion();
- DEBUG1("gtnets_get_time_to_next_flow_completion received %lg",
+ XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %lg",
time_to_next_flow_completion);
return time_to_next_flow_completion;
num_flows = 0;
if (gtnets_run_until_next_flow_completion(&metadata, &num_flows)) {
- xbt_assert0(0,
- "Cannot run GTNetS simulation until next flow completion");
+ xbt_die("Cannot run GTNetS simulation until next flow completion");
}
if (num_flows < 1) {
- xbt_assert0(0,
- "GTNetS simulation couldn't find a flow that would complete");
+ xbt_die("GTNetS simulation couldn't find a flow that would complete");
}
xbt_swag_foreach(action, running_actions) {
- DEBUG2("Action (%p) remains old value: %f", action,
+ XBT_DEBUG("Action (%p) remains old value: %f", action,
action->generic_action.remains);
double sent = gtnets_get_flow_rx(action);
// }
#endif
- DEBUG1("Sent value returned by GTNetS : %f", sent);
+ XBT_DEBUG("Sent value returned by GTNetS : %f", sent);
//need to trust this remain value
if (sent == 0) {
action->generic_action.remains = 0;
action->generic_action.remains =
action->generic_action.cost - sent;
}
- DEBUG2("Action (%p) remains new value: %f", action,
+ XBT_DEBUG("Action (%p) remains new value: %f", action,
action->generic_action.remains);
}
TRACE_surf_gtnets_destroy(action);
#endif
action_state_set((surf_action_t) action, SURF_ACTION_DONE);
- DEBUG1("----> Action (%p) just terminated", action);
+ XBT_DEBUG("----> Action (%p) just terminated", action);
}
} else { /* run for a given number of seconds */
if (gtnets_run(delta)) {
- xbt_assert0(0, "Cannot run GTNetS simulation");
+ xbt_die("Cannot run GTNetS simulation");
}
}
tmgr_trace_event_t event_type,
double value, double date)
{
- xbt_assert0(0, "Cannot update model state for GTNetS simulation");
+ xbt_die("Cannot update model state for GTNetS simulation");
}
/* Max durations are not supported */
xbt_assert0((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
- DEBUG4("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
+ XBT_DEBUG("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
dst_name);
xbt_dynar_t links = global_routing->get_route(src_name, dst_name);
/* Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
- xbt_assert2(0, "Not route between host %s and host %s", src_name,
- dst_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);
/* Added the initialization for GTNetS interface */
if (gtnets_initialize(sg_tcp_gamma)) {
- xbt_assert0(0, "Impossible to initialize GTNetS interface");
+ xbt_die("Impossible to initialize GTNetS interface");
}
routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL);