X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3354174bd5dce6022d6f8ae963ec8ab8f53f3add..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/surf/surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index d0d38aecdd..2237a67897 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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. */
@@ -6,9 +6,10 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
+#include <xbt/asserts.h>
+#include <xbt/function_types.h>
+
 #include "src/internal_config.h"
-#include "src/surf/surf_private.hpp"
-#include "xbt/function_types.h"
 
 #include <cfloat>
 #include <cmath>
@@ -21,15 +22,14 @@
 /*********
  * Utils *
  *********/
+XBT_PRIVATE FILE* surf_fopen(const std::string& name, const char* mode);
+XBT_PRIVATE std::ifstream* surf_ifsopen(const std::string& name);
 
 /* user-visible parameters */
 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_latency_factor;
-extern XBT_PRIVATE double sg_bandwidth_factor;
-extern XBT_PRIVATE double sg_weight_S_parameter;
 extern XBT_PRIVATE std::vector<std::string> surf_path;
 extern XBT_PRIVATE std::unordered_map<std::string, simgrid::kernel::profile::Profile*> traces_set_list;
 
@@ -75,6 +75,8 @@ static inline int double_equals(double value1, double value2, double precision)
  */
 XBT_PUBLIC void surf_cpu_model_init_Cas01();
 
+XBT_PUBLIC void surf_disk_model_init_S19();
+
 /** @ingroup SURF_models
  *  @brief Same as network model 'LagrangeVelho', only with different correction factors.
  *
@@ -84,9 +86,6 @@ XBT_PUBLIC void surf_cpu_model_init_Cas01();
  *
  *  @see surf_host_model_init_SMPI()
  */
-#if !HAVE_SMPI
-XBT_ATTRIB_NORETURN
-#endif
 XBT_PUBLIC void surf_network_model_init_SMPI();
 
 /** @ingroup SURF_models
@@ -179,8 +178,6 @@ XBT_PUBLIC void surf_host_model_init_current_default();
  */
 XBT_PUBLIC void surf_host_model_init_ptask_L07();
 
-XBT_PUBLIC void surf_disk_model_init_default();
-
 /* --------------------
  *  Model Descriptions
  * -------------------- */