X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a826bc9b199ebfc23aa7a1bb38f8cdbab57e105..b99c0d78b25704a61225be8a8b5c47b246afe22a:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index bd9d3fef86..dae5142808 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -51,11 +51,6 @@ class Action; class ActionLmm; class StorageActionLmm; } -namespace kernel { -namespace routing { -class RoutingPlatf; -} -} } typedef simgrid::surf::Model surf_Model; @@ -71,7 +66,6 @@ typedef simgrid::surf::NetworkCm02Link surf_NetworkCm02Link; typedef simgrid::surf::Action surf_Action; typedef simgrid::surf::ActionLmm surf_ActionLmm; typedef simgrid::surf::StorageActionLmm surf_StorageActionLmm; -typedef simgrid::kernel::routing::RoutingPlatf surf_RoutingPlatf; #else @@ -88,7 +82,6 @@ typedef struct surf_NetworkCm02Link surf_NetworkCm02Link; typedef struct surf_Action surf_Action; typedef struct surf_ActionLmm surf_ActionLmm; typedef struct surf_StorageActionLmm surf_StorageActionLmm; -typedef struct surf_RoutingPlatf surf_RoutingPlatf; #endif @@ -118,7 +111,6 @@ typedef surf_Cpu *surf_cpu_t; * \see e_surf_action_state_t */ typedef surf_Action *surf_action_t; -typedef surf_RoutingPlatf *routing_platf_t; typedef struct surf_file *surf_file_t; @@ -139,8 +131,6 @@ XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * t /* Generic model object */ /***************************/ -XBT_PUBLIC_DATA(routing_platf_t) routing_platf; - static inline void *surf_storage_resource_priv(const void *storage){ return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL); } @@ -175,9 +165,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 Create a sleep action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_sleep(sg_host_t host, double duration); - /** @brief Create a file opening action on the given host */ XBT_PUBLIC(surf_action_t) surf_host_open(sg_host_t host, const char* fullpath); @@ -646,8 +633,6 @@ XBT_PUBLIC(void) parse_platform_file(const char *file); /* For the trace and trace:connect tag (store their content till the end of the parsing) */ XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; -XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name); - /* * Returns the initial path. On Windows the initial path is the current directory for the current process in the other * case the function returns "./" that represents the current directory on Unix/Linux platforms.