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_IN_F("(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");
}
}
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);
}
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)
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;
}
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) {
} 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 */
/* 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);