no need for a NetCard and a NetCardImpl when both are in the same file

diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp
index f4afb7e..80d8442 100644 (file)
--- a/src/kernel/routing/AsImpl.cpp
+++ b/src/kernel/routing/AsImpl.cpp
@@ -21,7 +21,7 @@ namespace simgrid {
     xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL),
                "Refusing to create a second AS called '%s'.", name);
 
     xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL),
                "Refusing to create a second AS called '%s'.", name);
 

-    netcard_ = new NetCardImpl(name, NetCard::Type::As, static_cast<AsImpl*>(father));
+    netcard_ = new NetCard(name, NetCard::Type::As, static_cast<AsImpl*>(father));

     xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
     XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id());
   }
     xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
     XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id());
   }


@@ -33,7 +33,7 @@ namespace simgrid {
     if (hierarchy_ == RoutingMode::unset)
       hierarchy_ = RoutingMode::base;
 
     if (hierarchy_ == RoutingMode::unset)
       hierarchy_ = RoutingMode::base;
 

-    res->pimpl_netcard = new NetCardImpl(name, NetCard::Type::Host, this);
+    res->pimpl_netcard = new NetCard(name, NetCard::Type::Host, this);

 
     surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
 
 
     surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
 

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 4498af4..58c5190 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -119,7 +119,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
              "Refusing to create a router named '%s': this name already describes a node.", router->id);
 
   simgrid::kernel::routing::NetCard* netcard =
              "Refusing to create a router named '%s': this name already describes a node.", router->id);
 
   simgrid::kernel::routing::NetCard* netcard =

-    new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing);
+    new simgrid::kernel::routing::NetCard(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing);

   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard);
   XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id());
 
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard);
   XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id());
 

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 1e4e988..1f3290c 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -49,7 +49,6 @@ XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
 extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
 
 
 extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
 
 

-XBT_PUBLIC(void) routing_exit();

 XBT_PUBLIC(void) storage_register_callbacks();
 
 XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) storage_register_callbacks();
 
 XBT_PUBLIC(void) routing_register_callbacks(void);

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 01a39c9..72680dc 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -41,38 +41,30 @@ class RoutingPlatf;
  */
 class NetCard {
 public:
  */
 class NetCard {
 public:

-  virtual ~NetCard()            = default;
-  virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
-  virtual std::string name()    = 0;
-  virtual const char* cname()    = 0;
-  virtual AsImpl* containingAS() = 0; // This is the AS in which I am
-  virtual bool isAS()=0;
-  virtual bool isHost()=0;
-  virtual bool isRouter()=0;

   enum class Type {
     Host, Router, As
   };
   enum class Type {
     Host, Router, As
   };

-};

 
 

-struct XBT_PRIVATE NetCardImpl : public NetCard {
-public:
-  NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS)
+  NetCard(std::string name, NetCard::Type componentType, AsImpl* containingAS)

       : name_(name), componentType_(componentType), containingAS_(containingAS)
   {
     if (containingAS != nullptr)
       id_ = containingAS->addComponent(this);
     simgrid::kernel::routing::netcardCreatedCallbacks(this);
   }
       : name_(name), componentType_(componentType), containingAS_(containingAS)
   {
     if (containingAS != nullptr)
       id_ = containingAS->addComponent(this);
     simgrid::kernel::routing::netcardCreatedCallbacks(this);
   }

-  ~NetCardImpl() = default;
+  ~NetCard() = default;
+
+  // Our rank in the vertices_ array of our containing AS.
+  unsigned int id()      {return id_;}
+  std::string name()     { return name_; }
+  const char* cname()    { return name_.c_str(); }
+  // This is the AS in which I am
+  AsImpl *containingAS() {return containingAS_;}

 
 

-  unsigned int id()  override {return id_;}
-  std::string name() override { return name_; }
-  const char* cname() override { return name_.c_str(); }
-  AsImpl *containingAS() override {return containingAS_;}
+  bool isAS()            {return componentType_ == Type::As;}
+  bool isHost()          {return componentType_ == Type::Host;}
+  bool isRouter()        {return componentType_ == Type::Router;}

 
 

-  bool isAS()        override {return componentType_ == Type::As;}
-  bool isHost()      override {return componentType_ == Type::Host;}
-  bool isRouter()    override {return componentType_ == Type::Router;}

 
 private:
   unsigned int id_;
 
 private:
   unsigned int id_;