X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b553ed36fe1119ceee50c0c6c5ac1cc6d47fd3..fd77edf75909515d711d8be2c27e61e23a72ba74:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index c3c8fa6f62..4605e692f3 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -52,7 +52,7 @@ class NetworkModel; class StorageModel; class Resource; class ResourceLmm; -class Host; +class HostImpl; class HostCLM03; class NetworkCm02Link; class Action; @@ -72,7 +72,7 @@ typedef simgrid::surf::NetworkModel surf_NetworkModel; typedef simgrid::surf::StorageModel surf_StorageModel; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::surf::ResourceLmm surf_ResourceLmm; -typedef simgrid::surf::Host surf_Host; +typedef simgrid::surf::HostImpl surf_Host; typedef simgrid::surf::HostCLM03 surf_HostCLM03; typedef simgrid::surf::NetworkCm02Link surf_NetworkCm02Link; typedef simgrid::surf::Action surf_Action; @@ -131,19 +131,6 @@ typedef surf_RoutingPlatf *routing_platf_t; typedef struct surf_file *surf_file_t; -/** @Brief Specify that we use that action */ -XBT_PUBLIC(void) surf_action_ref(surf_action_t action); - -/** @brief Creates a new action. - * - * @param size The size is the one of the subtype you want to create - * @param cost initial value - * @param model to which model we should attach this action - * @param failed whether we should start this action in failed mode - */ -XBT_PUBLIC(void *) surf_action_new(size_t size, double cost, - surf_model_t model, int failed); - /** \brief Resource model description */ typedef struct surf_model_description { @@ -152,10 +139,8 @@ typedef struct surf_model_description { void_f_void_t model_init_preparse; } s_surf_model_description_t, *surf_model_description_t; -XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table, - const char *name); -XBT_PUBLIC(void) model_help(const char *category, - s_surf_model_description_t * table); +XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table, const char *name); +XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * table); /** @ingroup SURF_interface * @brief Action states @@ -226,10 +211,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_failed_action_set(surf_model_t mode */ XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model); -/** @brief Get the route (dynar of sg_link_t) between two hosts */ -XBT_PUBLIC(xbt_dynar_t) surf_host_model_get_route( - surf_host_model_t model, sg_host_t src, sg_host_t dst); - /** @brief Create a new VM on the specified host */ XBT_PUBLIC(void) surf_vm_model_create(const char *name, sg_host_t host_PM);