X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bb0a4c740aeef584818cc72196508d1b483100b..a5c5765ba9e8336b55101d248a8f43fbf9cd0c0c:/src/surf/network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 082934e5e4..421f3993a0 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -26,19 +26,13 @@
 namespace simgrid {
   namespace surf {
 
-    class NetworkModel;
     class NetworkAction;
 
-    /*************
-     * Callbacks *
-     *************/
-
-
     /** @brief Callback signal fired when the state of a NetworkAction changes
      *  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;
 
-      }
+  }
 }
 /*********
  * Model *
@@ -57,11 +51,7 @@ namespace simgrid {
       NetworkModel() : Model() { }
 
       /** @brief Destructor */
-      ~NetworkModel() {
-        lmm_system_free(maxminSystem_);
-        xbt_heap_free(actionHeap_);
-        delete modifiedSet_;
-      }
+      ~NetworkModel() override;
 
       /**
        * @brief Create a Link
@@ -70,8 +60,7 @@ namespace simgrid {
        * @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
+       * @param props Dictionary of properties associated to this Link
        */
       virtual Link* createLink(const char *name, double bandwidth, double latency,
           e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0;
@@ -79,7 +68,7 @@ namespace simgrid {
       /**
        * @brief Create a communication between two hosts.
        * @details It makes calls to the routing part, and execute the communication
-       * between the two end points.
+       *          between the two end points.
        *
        * @param src The source of the communication
        * @param dst The destination of the communication
@@ -138,35 +127,22 @@ namespace simgrid {
      ************/
     /** @ingroup SURF_network_interface
      * @brief SURF network link interface class
-     * @details A Link represents the link between two [hosts](\ref Host)
+     * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl)
      */
     class Link :
         public simgrid::surf::Resource,
         public simgrid::surf::PropertyHolder {
         public:
-      /**
-       * @brief Link constructor
-       *
-       * @param model The NetworkModel associated to this Link
-       * @param name The name of the Link
-       * @param props Dictionary of properties associated to this Link
-       */
-      Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props);
 
-      /**
-       * @brief Link constructor
-       *
-       * @param model The NetworkModel associated to this Link
-       * @param name The name of the Link
-       * @param props Dictionary of properties associated to this Link
-       * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
-       */
+      /** @brief Constructor of non-LMM links */
+      Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props);
+      /** @brief Constructor of LMM links */
       Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint);
 
       /* Link destruction logic */
       /**************************/
         protected:
-      ~Link();
+      ~Link() override;
         public:
       void destroy(); // Must be called instead of the destructor
         private:
@@ -242,7 +218,7 @@ namespace simgrid {
      **********/
     /** @ingroup SURF_network_interface
      * @brief SURF network action interface class
-     * @details A NetworkAction represents a communication between two [hosts](\ref Host)
+     * @details A NetworkAction represents a communication between two [hosts](\ref HostImpl)
      */
     class NetworkAction : public simgrid::surf::Action {
     public: