Kill the useless NS3Sim class

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

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 7bacd5a..4b4c256 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -35,8 +35,8 @@ namespace simgrid {
 
 
     /** @brief Callback signal fired when the state of a NetworkAction changes
-     *  Signature: `void(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t current)` */
-    XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)>) networkActionStateChangedCallbacks;
+     *  Signature: `void(NetworkAction *action, simgrid::surf::Action::State old, simgrid::surf::Action::State current)` */
+    XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::Action::State, simgrid::surf::Action::State)>) networkActionStateChangedCallbacks;
 
     /** @brief Callback signal fired when a NetworkAction is created (when a communication starts)
      *  Signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate)` */
@@ -68,33 +68,25 @@ namespace simgrid {
 
       /** @brief Destructor */
       ~NetworkModel() {
-        if (p_maxminSystem)
-          lmm_system_free(p_maxminSystem);
-        if (p_actionHeap)
-          xbt_heap_free(p_actionHeap);
-        if (p_modifiedSet)
-          delete p_modifiedSet;
+        if (maxminSystem_)
+          lmm_system_free(maxminSystem_);
+        if (actionHeap_)
+          xbt_heap_free(actionHeap_);
+        delete modifiedSet_;
       }
 
       /**
        * @brief Create a Link
        *
        * @param name The name of the Link
-       * @param bw_initial The initial bandwidth of the Link in bytes per second
-       * @param bw_trace The trace associated to the Link bandwidth
-       * @param lat_initial The initial latency of the Link in seconds
-       * @param lat_trace The trace associated to the Link latency
+       * @param bandwidth The initial bandwidth of the Link in bytes per second
+       * @param latency The initial latency of the Link in seconds
        * @param policy The sharing policy of the Link
        * @param properties Dictionary of properties associated to this Resource
        * @return The created Link
        */
-      virtual Link* createLink(const char *name,
-          double bw_initial,
-          tmgr_trace_t bw_trace,
-          double lat_initial,
-          tmgr_trace_t lat_trace,
-          e_surf_link_sharing_policy_t policy,
-          xbt_dict_t properties)=0;
+      virtual Link* createLink(const char *name, double bandwidth, double latency,
+          e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0;
 
       /**
        * @brief Create a communication between two hosts.
@@ -108,8 +100,7 @@ namespace simgrid {
        * unlimited.
        * @return The action representing the communication
        */
-      virtual Action *communicate(NetCard *src, NetCard *dst,
-          double size, double rate)=0;
+      virtual Action *communicate(NetCard *src, NetCard *dst, double size, double rate)=0;
 
       /** @brief Function pointer to the function to use to solve the lmm_system_t
        *
@@ -184,9 +175,6 @@ namespace simgrid {
        */
       Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint);
 
-      /** @brief State traces are used to model the on/off state of the link */
-      void setStateTrace(tmgr_trace_t trace);
-
       /* Link destruction logic */
       /**************************/
         protected:
@@ -231,9 +219,9 @@ namespace simgrid {
       void turnOn() override;
       void turnOff() override;
 
-      virtual void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values. */
-      virtual void set_bandwidth_trace(tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to external load). Trace must contain percentages (value between 0 and 1). */
-      virtual void set_latency_trace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load). Trace must contain absolute values */
+      virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values. */
+      virtual void setBandwidthTrace(tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to external load). Trace must contain percentages (value between 0 and 1). */
+      virtual void setLatencyTrace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load). Trace must contain absolute values */
 
       tmgr_trace_iterator_t m_stateEvent = NULL;
       s_surf_metric_t m_latency = {1.0,0,NULL};
@@ -286,15 +274,15 @@ namespace simgrid {
       NetworkAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
       : simgrid::surf::Action(model, cost, failed, var) {};
 
-      void setState(e_surf_action_state_t state);
+      void setState(simgrid::surf::Action::State state) override;
 
-      double m_latency;
-      double m_latCurrent;
-      double m_weight;
-      double m_rate;
-      const char* p_senderLinkName;
-      double m_senderSize;
-      xbt_fifo_item_t p_senderFifoItem;
+      double latency_;
+      double latCurrent_;
+      double weight_;
+      double rate_;
+      const char* senderLinkName_;
+      double senderSize_;
+      xbt_fifo_item_t senderFifoItem_;
     };
   }
 }