X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b04e106fa6f41fb78629ec02eae652a9500e8f84..8fea398a5a9ca83c4e6009daf964d59869388e6c:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 4388b32b5f..191c3508b0 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -13,7 +13,6 @@ #include "xbt/misc.h" #include "xbt/config.h" #include "src/internal_config.h" -#include "surf/surf_routing.h" #include "surf/datatypes.h" #include "simgrid/datatypes.h" #include "simgrid/forward.h" @@ -55,6 +54,7 @@ typedef simgrid::surf::StorageModel surf_StorageModel; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::surf::HostImpl surf_Host; typedef simgrid::surf::Action surf_Action; +typedef simgrid::surf::FileImpl surf_File; #else @@ -68,6 +68,7 @@ typedef struct surf_StorageModel surf_StorageModel; typedef struct surf_Resource surf_Resource; typedef struct surf_Host surf_Host; typedef struct surf_Action surf_Action; +typedef struct surf_File surf_File; #endif @@ -83,6 +84,7 @@ typedef surf_HostModel *surf_host_model_t; typedef surf_NetworkModel *surf_network_model_t; typedef surf_StorageModel *surf_storage_model_t; typedef surf_Storage* surf_storage_t; +typedef surf_File* surf_file_t; /** @ingroup SURF_c_bindings * \brief Action structure @@ -94,7 +96,6 @@ typedef surf_Storage* surf_storage_t; */ typedef surf_Action *surf_action_t; -typedef struct surf_file *surf_file_t; /** \brief Resource model description */ @@ -139,9 +140,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 file opening action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_open(sg_host_t host, const char* fullpath); - /** @brief Create a file closing action on the given host */ XBT_PUBLIC(surf_action_t) surf_host_close(sg_host_t host, surf_file_t fd);