X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/564a883b3d816d2c5d227f5311d248ef799b5190..d7fe4acd47d3cb1db46b1400d032dc4475d067b3:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 11f12e4615..9b0bd39211 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -13,7 +13,7 @@ #include "xbt/graph.h" #include "xbt/misc.h" #include "xbt/config.h" -#include "src/portable.h" +#include "src/internal_config.h" #include "surf/surf_routing.h" #include "surf/datatypes.h" #include "xbt/lib.h" @@ -223,17 +223,6 @@ XBT_PUBLIC(void) surf_vm_model_create(const char *name, sg_host_t host_PM); */ XBT_PUBLIC(surf_action_t) surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate); -/** - * @brief Get the name of a surf resource (cpu, host, network, …) - * - * @param resource The surf resource - * @return The name of the surf resource - */ -XBT_PUBLIC(const char * ) surf_resource_name(surf_cpp_resource_t resource); - -/** @brief Get the available speed of cpu associated to a host */ -XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host); - /** @brief Create a sleep action on the given host */ XBT_PUBLIC(surf_action_t) surf_host_sleep(sg_host_t host, double duration); @@ -486,7 +475,6 @@ XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource); /* Implementations of model object */ /**************************************/ -XBT_PUBLIC_DATA(int) autoload_surf_cpu_model; XBT_PUBLIC_DATA(void_f_void_t) surf_cpu_model_init_preparse; /** \ingroup SURF_models @@ -592,7 +580,7 @@ XBT_PUBLIC(void) surf_network_model_init_Constant(void); */ XBT_PUBLIC(void) surf_network_model_init_CM02(void); -#ifdef HAVE_NS3 +#if HAVE_NS3 /** \ingroup SURF_models * \brief Initializes the platform with the network model NS3 *