reduce the scope of some #include, and cut useless ones

[simgrid.git] / src / surf / network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index f141ecb..5c7a00e 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -11,8 +11,7 @@
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/surf/PropertyHolder.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "xbt/base.h"
+#include "src/surf/trace_mgr.hpp"
 
 #include <list>
 #include <unordered_map>
@@ -33,10 +32,10 @@ namespace surf {
  */
 class NetworkModel : public kernel::resource::Model {
 public:
-  /** @brief Constructor */
-  NetworkModel() : Model() {}
+  static simgrid::config::Flag<double> cfg_tcp_gamma;
+  static simgrid::config::Flag<bool> cfg_crosstraffic;
 
-  /** @brief Destructor */
+  explicit NetworkModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {}
   ~NetworkModel() override;
 
   /**
@@ -64,12 +63,6 @@ public:
    */
   virtual kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0;
 
-  /** @brief Function pointer to the function to use to solve the lmm_system_t
-   *
-   * @param system The lmm_system_t to solve
-   */
-  void (*f_networkSolve)(kernel::lmm::System*) = kernel::lmm::lmm_solve;
-
   /**
    * @brief Get the right multiplicative factor for the latency.
    * @details Depending on the model, the effective latency when sending
@@ -147,10 +140,10 @@ public:
   virtual int sharingPolicy();
 
   /** @brief Check if the Link is used */
-  bool isUsed() override;
+  bool is_used() override;
 
-  void turnOn() override;
-  void turnOff() override;
+  void turn_on() override;
+  void turn_off() override;
 
   virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF).
                                                           Trace must contain boolean values. */
@@ -217,7 +210,7 @@ public:
   virtual std::list<LinkImpl*> links();
 
   double latency_    = {};
-  double latCurrent_ = {};
+  double lat_current_ = {};
   double weight_     = {};
   double rate_       = {};
 };