X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43540e99b9c710a14e7626d346b3f45b8ed4e7e5..a44d99b7ed60456d5f016fc2ac2e2aa41410a008:/src/surf/network_smpi.hpp

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index 0c02b26ef3..ea69e4af2b 100644
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,49 +1,34 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#ifndef SIMGRID_SURF_NETWORK_SMPI_HPP
+#define SIMGRID_SURF_NETWORK_SMPI_HPP
+
 #include <xbt/base.h>
 
 #include "network_cm02.hpp"
 
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE NetworkSmpiModel;
-
-/*********
- * Tools *
- *********/
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
-/*********
- * Model *
- *********/
-
-class NetworkSmpiModel : public NetworkCm02Model {
+class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model {
 public:
-  NetworkSmpiModel();
-  ~NetworkSmpiModel();
-
-  using NetworkCm02Model::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
-  void gapAppend(double size, Link* link, NetworkAction *action);
-  void gapRemove(Action *action);
-  double latencyFactor(double size);
-  double bandwidthFactor(double size);
-  double bandwidthConstraint(double rate, double bound, double size);
-  void communicateCallBack() {};
-};
+  using NetworkCm02Model::NetworkCm02Model;
 
+  double get_latency_factor(double size) override;
+  double get_bandwidth_factor(double size) override;
+  double get_bandwidth_constraint(double rate, double bound, double size) override;
 
-/************
- * Resource *
- ************/
-
-
-/**********
- * Action *
- **********/
-
+protected:
+  virtual void check_lat_factor_cb() override;
+  virtual void check_bw_factor_cb() override;
+};
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 
+#endif