static double ns3_share_resources(double min);
static void ns3_update_actions_state(double now, double delta);
static void finalize(void);
-static surf_action_t ns3_communicate(const char *src_name,
- const char *dst_name, double size, double rate);
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+ sg_routing_edge_t dst_elm,
+ double size, double rate);
static void action_suspend(surf_action_t action);
static void action_resume(surf_action_t action);
static int action_is_suspended(surf_action_t action);
onelink_t onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = onelink->src;
- char *dst = onelink->dst;
+ char *src = onelink->src->name;
+ char *dst = onelink->dst->name;
void *link = onelink->link_ptr;
-
if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id);
char * link_bdw = xbt_strdup(((surf_ns3_link_t)link)->data->bdw);
xbt_die("Impossible to initialize NS3 interface");
}
- routing_model_create(sizeof(s_surf_ns3_link_t), NULL);
+ routing_model_create(NULL);
define_callbacks_ns3();
NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
double data_delta_sent = data_sent - action->last_sent;
xbt_dynar_t route = NULL;
- routing_get_route_and_latency (action->src_name, action->dst_name, &route, NULL);
+
+ routing_get_route_and_latency (action->src_elm, action->dst_elm, &route, NULL);
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
surf_ns3_link_t *link = ((surf_ns3_link_t*)xbt_dynar_get_ptr (route, i));
}
/* Max durations are not supported */
-static surf_action_t ns3_communicate(void *src_card,
- void *dst_card, double size, double rate)
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+ sg_routing_edge_t dst_elm,
+ double size, double rate)
{
surf_action_network_ns3_t action = NULL;
- XBT_DEBUG("Communicate from %s to %s",src_name,dst_name);
+ XBT_DEBUG("Communicate from %s to %s", src_elm->name, dst_elm->name);
action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);
- ns3_create_flow(src_name, dst_name, surf_get_clock(), size, action);
+ ns3_create_flow(src_elm->name, dst_elm->name, surf_get_clock(), size, action);
#ifdef HAVE_TRACING
action->last_sent = 0;
- action->src_name = xbt_strdup (src_name);
- action->dst_name = xbt_strdup (dst_name);
+ action->src_elm = src_elm;
+ action->dst_elm = dst_elm;
#endif
return (surf_action_t) action;
xbt_swag_remove(action, action->state_set);
#ifdef HAVE_TRACING
- xbt_free(((surf_action_network_ns3_t)action)->src_name);
- xbt_free(((surf_action_network_ns3_t)action)->dst_name);
xbt_free(action->category);
#endif
XBT_DEBUG ("Removing action %p", action);