Exposing a pointer to internals is not considered as good OOP practices

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 5675e73..e179d55 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -49,7 +49,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
 
 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,
@@ -60,7 +60,7 @@ static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
 
 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) );
 }
@@ -165,8 +165,8 @@ static void create_ns3_topology(void)
   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->p_src->name();
+    char *dst = onelink->p_dst->name();
     simgrid::surf::NetworkNS3Link *link =
       static_cast<simgrid::surf::NetworkNS3Link *>(onelink->p_link);
 
@@ -288,10 +288,10 @@ xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
 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;
@@ -301,9 +301,9 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
   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)
@@ -393,18 +393,17 @@ NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dic
  : Link(model, name, props)
  , m_created(1)
 {
-  p_speed.scale = 1.0;
-  p_speed.peak = bw_initial;
-  m_latCurrent = lat_initial;
+  m_bandwidth.peak = bw_initial;
+  m_latency.peak = lat_initial;
 }
 
 NetworkNS3Link::~NetworkNS3Link()
 {
 }
 
-void NetworkNS3Link::updateState(tmgr_trace_iterator_t event_type, double value, double date)
+void NetworkNS3Link::apply_event(tmgr_trace_iterator_t event, double value)
 {
-
+  THROW_UNIMPLEMENTED;
 }
 
 /**********