static double time_to_next_flow_completion = -1;
-static double ns3_share_resources(double min);
-static void ns3_update_actions_state(double now, double delta);
-static void finalize(void);
+static double ns3_share_resources(surf_model_t network_model, double min);
+static void ns3_update_actions_state(surf_model_t network_model, double now, double delta);
+static void finalize(surf_model_t network_model);
static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
sg_routing_edge_t dst_elm,
double size, double rate);
surf_network_model = surf_model_init();
surf_network_model->name = "network NS3";
+ surf_network_model->type = SURF_MODEL_TYPE_NETWORK;
surf_network_model->extension.network.get_link_latency = ns3_get_link_latency;
surf_network_model->extension.network.get_link_bandwidth = ns3_get_link_bandwidth;
surf_network_model->extension.network.get_route = ns3_get_route;
#endif
}
-static void finalize(void)
+static void finalize(surf_model_t network_model)
{
ns3_finalize();
xbt_dynar_free_container(&IPV4addr);
xbt_dict_free(&dict_socket);
}
-static double ns3_share_resources(double min)
+static double ns3_share_resources(surf_model_t network_model, double min)
{
XBT_DEBUG("ns3_share_resources");
xbt_swag_t running_actions =
- surf_network_model->states.running_action_set;
+ network_model->states.running_action_set;
//get the first relevant value from the running_actions list
if (!xbt_swag_size(running_actions) || min == 0.0)
return time_to_next_flow_completion;
}
-static void ns3_update_actions_state(double now, double delta)
+static void ns3_update_actions_state(surf_model_t network_model, double now, double delta)
{
xbt_dict_cursor_t cursor = NULL;
char *key;
surf_action_network_ns3_t action = NULL;
xbt_swag_t running_actions =
- surf_network_model->states.running_action_set;
+ network_model->states.running_action_set;
/* If there are no running flows, just return */
if (!xbt_swag_size(running_actions)) {