X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..05736ee0ede974fcf9fb60a13a40c50d62fcc19d:/src/surf/network_smpi.hpp

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index beae8e2286..7a2f4db3ec 100644
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,71 +1,26 @@
-#include "network.hpp"
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-/***********
- * Classes *
- ***********/
+/* 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. */
 
-class NetworkSmpiModel;
-typedef NetworkSmpiModel *NetworkSmpiModelPtr;
+#include <xbt/base.h>
 
-class NetworkSmpiLink;
-typedef NetworkSmpiLink *NetworkSmpiLinkPtr;
+#include "network_cm02.hpp"
 
-class NetworkSmpiLinkLmm;
-typedef NetworkSmpiLinkLmm *NetworkSmpiLinkLmmPtr;
-
-class NetworkSmpiAction;
-typedef NetworkSmpiAction *NetworkSmpiActionPtr;
-
-class NetworkSmpiActionLmm;
-typedef NetworkSmpiActionLmm *NetworkSmpiActionLmmPtr;
-
-/*********
- * Tools *
- *********/
-
-/*********
- * Model *
- *********/
-
-class NetworkSmpiModel : public NetworkCm02Model {
-public:
-  NetworkSmpiModel(){};
-  void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action);
-  void gapRemove(ActionLmmPtr action);
-  double latencyFactor(double size);
-  double bandwidthFactor(double size);
-  double bandwidthConstraint(double rate, double bound, double size);
-  void communicateCallBack() {};
-};
-
-
-/************
- * Resource *
- ************/
-
-class NetworkSmpiLinkLmm : public NetworkCm02LinkLmm {
-public:
-  NetworkSmpiLinkLmm(NetworkSmpiModelPtr model, const char *name, xbt_dict_t props,
-	                           lmm_system_t system,
-	                           double constraint_value,
-	                           tmgr_history_t history,
-	                           e_surf_resource_state_t state_init,
-	                           tmgr_trace_t state_trace,
-	                           double metric_peak,
-	                           tmgr_trace_t metric_trace,
-	                           double lat_initial,
-	                           tmgr_trace_t lat_trace,
-                               e_surf_link_sharing_policy_t policy);
-};
-
-
-/**********
- * Action *
- **********/
-
-class NetworkSmpiActionLmm : public NetworkCm02ActionLmm {
-public:
-  NetworkSmpiActionLmm(ModelPtr model, double cost, bool failed);
-};
+namespace simgrid {
+  namespace surf {
 
+    class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model {
+    public:
+      NetworkSmpiModel();
+      ~NetworkSmpiModel();
 
+      using NetworkCm02Model::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
+      double latencyFactor(double size);
+      double bandwidthFactor(double size);
+      double bandwidthConstraint(double rate, double bound, double size);
+      void communicateCallBack() {};
+    };
+  }
+}