X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9966aa66acc63c0417fbeae8e3ff12bccb0cdb0..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 385a234718..80d582f5d7 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -6,37 +6,26 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
-#include "xbt/signal.hpp"
-#include "xbt/utility.hpp"
-
 #include "src/surf/surf_private.hpp"
-#include "surf/surf.hpp"
-#include "xbt/str.h"
 
-#include <boost/heap/pairing_heap.hpp>
-#include <boost/intrusive/list.hpp>
-#include <boost/optional.hpp>
 #include <cmath>
 #include <set>
 #include <string>
 #include <unordered_map>
-
-#define NO_MAX_DURATION -1.0
+#include <vector>
 
 /*********
  * Utils *
  *********/
 
 /* user-visible parameters */
-XBT_PUBLIC_DATA(double) sg_maxmin_precision;
-XBT_PUBLIC_DATA(double) sg_surf_precision;
-XBT_PUBLIC_DATA(int) sg_concurrency_limit;
+XBT_PUBLIC_DATA double sg_maxmin_precision;
+XBT_PUBLIC_DATA double sg_surf_precision;
+XBT_PUBLIC_DATA int sg_concurrency_limit;
 
-extern XBT_PRIVATE double sg_tcp_gamma;
 extern XBT_PRIVATE double sg_latency_factor;
 extern XBT_PRIVATE double sg_bandwidth_factor;
 extern XBT_PRIVATE double sg_weight_S_parameter;
-extern XBT_PRIVATE int sg_network_crosstraffic;
 extern XBT_PRIVATE std::vector<std::string> surf_path;
 extern XBT_PRIVATE std::unordered_map<std::string, tmgr_trace_t> traces_set_list;
 extern XBT_PRIVATE std::set<std::string> watched_hosts;
@@ -63,13 +52,10 @@ static inline int double_equals(double value1, double value2, double precision)
   return (fabs(value1 - value2) < precision);
 }
 
-extern "C" {
-XBT_PUBLIC(double) surf_get_clock();
-}
 /** \ingroup SURF_simulation
  *  \brief List of hosts that have just restarted and whose autorestart process should be restarted.
  */
-XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
+XBT_PUBLIC_DATA std::vector<sg_host_t> host_that_restart;
 
 int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
 
@@ -77,9 +63,4 @@ int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
  * Action *
  **********/
 
-/** \ingroup SURF_models
- *  \brief List of initialized models
- */
-XBT_PUBLIC_DATA(std::vector<simgrid::kernel::resource::Model*>*) all_existing_models;
-
 #endif /* SURF_MODEL_H_ */