X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a40fc047aa61d2fce966a98fe37945e4942b346..403af5e6247ce6452b721f418a5b41e4548efac4:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index ef5036bae0..7b0f721b4d 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -17,28 +17,15 @@ #include "simgrid/datatypes.h" #include "simgrid/forward.h" -SG_BEGIN_DECL() -/* Actions and models are highly connected structures... */ - -/* user-visible parameters */ -extern XBT_PRIVATE double sg_tcp_gamma; -extern XBT_PRIVATE double sg_sender_gap; -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 int sg_network_crosstraffic; - #ifdef __cplusplus namespace simgrid { namespace surf { - class Model; class CpuModel; class HostModel; class NetworkModel; class StorageModel; -class Resource; class NetworkCm02Link; class Action; } @@ -46,32 +33,32 @@ class Action; typedef simgrid::surf::Model surf_Model; typedef simgrid::surf::CpuModel surf_CpuModel; -typedef simgrid::surf::Cpu surf_Cpu; typedef simgrid::surf::HostModel surf_HostModel; typedef simgrid::surf::NetworkModel surf_NetworkModel; -typedef simgrid::surf::StorageImpl surf_Storage; 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 typedef struct surf_Model surf_Model; typedef struct surf_CpuModel surf_CpuModel; -typedef struct surf_Cpu surf_Cpu; typedef struct surf_HostModel surf_HostModel; typedef struct surf_NetworkModel surf_NetworkModel; -typedef struct surf_StorageImpl surf_Storage; 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 +SG_BEGIN_DECL() +/* Actions and models are highly connected structures... */ + +/* user-visible parameters */ +extern XBT_PRIVATE double sg_tcp_gamma; +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 int sg_network_crosstraffic; + /** @ingroup SURF_c_bindings * \brief Model datatype * @@ -83,8 +70,6 @@ typedef surf_CpuModel *surf_cpu_model_t; 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 @@ -104,10 +89,11 @@ struct surf_model_description { const char *description; void_f_void_t model_init_preparse; }; -typedef struct surf_model_description s_surf_model_description_t; -typedef struct surf_model_description* surf_model_description_t; +typedef struct surf_model_description s_surf_model_description_t; -XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table, const char *name); +#ifdef __cplusplus +XBT_PUBLIC(int) find_model_description(s_surf_model_description_t* table, std::string name); +#endif XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * table); /***************************/ @@ -140,94 +126,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 closing action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_close(sg_host_t host, surf_file_t fd); - -/** @brief Create a file reading action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_read(sg_host_t host, surf_file_t fd, sg_size_t size); - -/** @brief Create a file writing action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size); - -/** - * @brief Get the information of a file descriptor - * @details The returned xbt_dynar_t contains: - * - the size of the file, - * - the mount point, - * - the storage name, - * - the storage typeId, - * - the storage content type - * - * @param host The surf host - * @param fd The file descriptor - * @return An xbt_dynar_t with the file information - */ -XBT_PUBLIC(xbt_dynar_t) surf_host_get_info(sg_host_t host, surf_file_t fd); - -/** - * @brief Get the available space of the storage at the mount point - * - * @param resource The surf host - * @param name The mount point - * @return The amount of available space in bytes - */ -XBT_PUBLIC(sg_size_t) surf_host_get_free_size(sg_host_t resource, const char* name); - -/** - * @brief Get the used space of the storage at the mount point - * - * @param resource The surf host - * @param name The mount point - * @return The amount of used space in bytes - */ -XBT_PUBLIC(sg_size_t) surf_host_get_used_size(sg_host_t resource, const char* name); - -/** - * @brief Unlink a file descriptor - * - * @param host The surf host - * @param fd The file descriptor - * - * @return 0 if failed to unlink, 1 otherwise - */ -XBT_PUBLIC(int) surf_host_unlink(sg_host_t host, surf_file_t fd); - -/** - * @brief Get the current position of the file descriptor - * - * @param host The surf host - * @param fd The file descriptor - * @return The current position of the file descriptor - */ -XBT_PUBLIC(size_t) surf_host_file_tell(sg_host_t host, surf_file_t fd); - -/** - * @brief Move a file to another location on the *same mount point*. - * @details [long description] - * - * @param host The surf host - * @param fd The file descriptor - * @param fullpath The new full path - * - * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED - */ -XBT_PUBLIC(int) surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath); - -/** - * @brief Set the position indictator assiociated with the file descriptor to a new position - * @details [long description] - * - * @param host The surf host - * @param fd The file descriptor - * @param offset The offset from the origin - * @param origin Position used as a reference for the offset - * - SEEK_SET: beginning of the file - * - SEEK_CUR: current position indicator - * - SEEK_END: end of the file - * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED - */ -XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin); - /** * @brief [brief description] * @details [long description] @@ -245,14 +143,6 @@ XBT_PUBLIC(void) surf_cpu_action_set_bound(surf_action_t action, double bound); */ XBT_PUBLIC(double) surf_network_action_get_latency_limited(surf_action_t action); -/** - * @brief Get the file associated to a storage action - * - * @param action The surf storage action - * @return The file associated to a storage action - */ -XBT_PUBLIC(surf_file_t) surf_storage_action_get_file(surf_action_t action); - /** @} */ /**************************************/ @@ -477,11 +367,6 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_host_model_description[]; */ XBT_PUBLIC(void) surf_vm_model_init_HL13(); -/** \ingroup SURF_simulation - * \brief List of hosts for which one want to be notified if they ever restart. - */ -XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib; - /*** SURF Globals **************************/ /** \ingroup SURF_simulation @@ -531,15 +416,9 @@ XBT_PUBLIC(double) surf_get_clock(); */ XBT_PUBLIC(void) surf_exit(); -/* Prototypes of the functions that handle the properties */ -XBT_PUBLIC_DATA(xbt_dict_t) current_property_set;// the prop set for the currently parsed element (also used in SIMIX) - /* surf parse file related (public because called from a test suite) */ 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; - /* * 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. @@ -549,15 +428,9 @@ const char *__surf_get_initial_path(); /********** Tracing **********/ /* from surf_instr.c */ void TRACE_surf_action(surf_action_t surf_action, const char *category); -void TRACE_surf_alloc(); -void TRACE_surf_release(); /* instr_routing.c */ void instr_routing_define_callbacks (); -void instr_new_variable_type (const char *new_typename, const char *color); -void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color); -void instr_new_user_state_type (const char *father_type, const char *new_typename); -void instr_new_value_for_user_state_type (const char *_typename, const char *value, const char *color); int instr_platform_traced (); xbt_graph_t instr_routing_platform_graph (); void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);