X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a826bc9b199ebfc23aa7a1bb38f8cdbab57e105..8fea398a5a9ca83c4e6009daf964d59869388e6c:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index bd9d3fef86..191c3508b0 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifndef _SURF_SURF_H -#define _SURF_SURF_H +#ifndef SURF_SURF_H +#define SURF_SURF_H #include "xbt/swag.h" #include "xbt/dynar.h" @@ -14,10 +13,7 @@ #include "xbt/misc.h" #include "xbt/config.h" #include "src/internal_config.h" -#include "surf/surf_routing.h" #include "surf/datatypes.h" -#include "xbt/lib.h" -#include "surf/surf_routing.h" #include "simgrid/datatypes.h" #include "simgrid/forward.h" @@ -31,7 +27,6 @@ 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; -extern XBT_PRIVATE xbt_dynar_t surf_path; #ifdef __cplusplus @@ -44,51 +39,36 @@ class HostModel; class NetworkModel; class StorageModel; class Resource; -class ResourceLmm; -class HostCLM03; class NetworkCm02Link; class Action; -class ActionLmm; -class StorageActionLmm; -} -namespace kernel { -namespace routing { -class RoutingPlatf; -} } } 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::ResourceLmm surf_ResourceLmm; typedef simgrid::surf::HostImpl surf_Host; -typedef simgrid::surf::HostCLM03 surf_HostCLM03; -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; +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_ResourceLmm surf_ResourceLmm; -typedef struct surf_HostCLM03 surf_HostCLM03; typedef struct surf_Host surf_Host; -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; +typedef struct surf_File surf_File; #endif @@ -103,11 +83,8 @@ 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 xbt_dictelm_t surf_resource_t; -typedef surf_Resource *surf_cpp_resource_t; -typedef surf_Host *surf_host_t; -typedef surf_Cpu *surf_cpu_t; +typedef surf_Storage* surf_storage_t; +typedef surf_File* surf_file_t; /** @ingroup SURF_c_bindings * \brief Action structure @@ -118,9 +95,7 @@ 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; /** \brief Resource model description */ @@ -139,16 +114,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); -} - -static inline void *surf_storage_resource_by_name(const char *name){ - return xbt_lib_get_elm_or_null(storage_lib, name); -} - /** @{ @ingroup SURF_c_bindings */ /** @@ -175,12 +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 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); - /** @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); @@ -279,21 +238,13 @@ XBT_PUBLIC(int) surf_host_file_move(sg_host_t host, surf_file_t fd, const char* */ XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin); -/** - * @brief Get the content of a storage - * - * @param resource The surf storage - * @return A xbt_dict_t with path as keys and size in bytes as values - */ -XBT_PUBLIC(xbt_dict_t) surf_storage_get_content(surf_resource_t resource); - /** * @brief Get the size in bytes of a storage * * @param resource The surf storage * @return The size in bytes of the storage */ -XBT_PUBLIC(sg_size_t) surf_storage_get_size(surf_resource_t resource); +XBT_PUBLIC(sg_size_t) surf_storage_get_size(surf_storage_t resource); /** * @brief Get the available size in bytes of a storage @@ -301,7 +252,7 @@ XBT_PUBLIC(sg_size_t) surf_storage_get_size(surf_resource_t resource); * @param resource The surf storage * @return The available size in bytes of the storage */ -XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_resource_t resource); +XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_storage_t resource); /** * @brief Get the size in bytes of a storage @@ -309,10 +260,10 @@ XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_resource_t resource); * @param resource The surf storage * @return The used size in bytes of the storage */ -XBT_PUBLIC(sg_size_t) surf_storage_get_used_size(surf_resource_t resource); +XBT_PUBLIC(sg_size_t) surf_storage_get_used_size(surf_storage_t resource); /** @brief return the properties set associated to that storage */ -XBT_PUBLIC(xbt_dict_t) surf_storage_get_properties(surf_resource_t resource); +XBT_PUBLIC(xbt_dict_t) surf_storage_get_properties(surf_storage_t resource); /** * @brief [brief description] @@ -355,7 +306,8 @@ XBT_PUBLIC(xbt_dict_t) surf_storage_action_get_ls_dict(surf_action_t action); * @return The host name * may not exist. */ -XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource); +XBT_PUBLIC(const char*) surf_storage_get_host(surf_storage_t resource); +XBT_PUBLIC(const char*) surf_storage_get_name(surf_storage_t resource); /** @} */ @@ -637,8 +589,6 @@ 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) -/* The same for model_prop set*/ -XBT_PUBLIC_DATA(xbt_dict_t) current_model_property_set; /* surf parse file related (public because called from a test suite) */ XBT_PUBLIC(void) parse_platform_file(const char *file); @@ -646,8 +596,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. @@ -671,4 +619,5 @@ xbt_graph_t instr_routing_platform_graph (); void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename); SG_END_DECL() -#endif /* _SURF_SURF_H */ + +#endif