Give a p_netcard to simgrid::Host instead of relying on extensions for that

[simgrid.git] / include / simgrid / Host.hpp

diff --git a/include/simgrid/Host.hpp b/include/simgrid/Host.hpp
index d61aefa..2810c16 100644 (file)
--- a/include/simgrid/Host.hpp
+++ b/include/simgrid/Host.hpp
@@ -7,22 +7,30 @@
 #ifndef SIMGRID_HOST_HPP
 #define SIMGRID_HOST_HPP
 
 #ifndef SIMGRID_HOST_HPP
 #define SIMGRID_HOST_HPP
 

+#include <cstddef>

 #include <memory>
 #include <string>
 #include <vector>
 
 #include <xbt/base.h>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <xbt/base.h>

-#include <xbt/Facetable.hpp>
+#include <xbt/string.hpp>
+#include <xbt/Extendable.hpp>

 
 namespace simgrid {
 
 
 namespace simgrid {
 

-XBT_PUBLIC_CLASS Host : public simgrid::xbt::Facetable<Host> {
+XBT_PUBLIC_CLASS Host :
+public simgrid::xbt::Extendable<Host> {
+
+public:
+         surf::Cpu     *p_cpu = nullptr;
+         surf::NetCard *p_netcard = nullptr;
+

 private:
 private:

-  std::string id_;
+  simgrid::xbt::string name_ = "noname";

 public:
 public:

-  Host(std::string id);
+  Host(std::string const& name);

   ~Host();
   ~Host();

-  std::string const& id() const { return id_; }
+  simgrid::xbt::string const& getName() const { return name_; }

   static Host* by_name_or_null(const char* name);
   static Host* by_name_or_create(const char* name);
 };
   static Host* by_name_or_null(const char* name);
   static Host* by_name_or_create(const char* name);
 };