static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
{
- const char* router_id = router->getName();
+ const char* router_id = router->name();
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
xbt_lib_set(as_router_lib,
router_id,
static void parse_ns3_add_AS(simgrid::surf::As* as)
{
- const char* as_id = as->p_name;
+ const char* as_id = as->name_;
XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
}
simgrid::surf::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = onelink->p_src->getName();
- char *dst = onelink->p_dst->getName();
+ char *src = onelink->src_->name();
+ char *dst = onelink->dst_->name();
simgrid::surf::NetworkNS3Link *link =
- static_cast<simgrid::surf::NetworkNS3Link *>(onelink->p_link);
+ static_cast<simgrid::surf::NetworkNS3Link *>(onelink->link_);
if (strcmp(src,dst) && link->m_created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
- XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());
+ XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
NetworkNS3Action *action = new NetworkNS3Action(this, size, 0);
- ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action);
+ ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, action);
action->m_lastSent = 0;
action->p_srcElm = src;
return (surf_action_t) action;
}
-double NetworkNS3Model::shareResources(double now)
+double NetworkNS3Model::next_occuring_event(double now)
{
- XBT_DEBUG("ns3_share_resources");
+ XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
if (!getRunningActionSet()->size() || now == 0.0)
{
}
-void NetworkNS3Link::updateState(tmgr_trace_iterator_t event_type, double value)
+void NetworkNS3Link::apply_event(tmgr_trace_iterator_t event, double value)
{
THROW_UNIMPLEMENTED;
}