X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..36ed9bb3db4df8293627b73fc83b6250b1026af1:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 31522c6bfe..771db26cc2 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -12,35 +12,38 @@ #include "xbt/dict.h" #include "xbt/graph.h" #include "xbt/misc.h" -#include "portable.h" #include "xbt/config.h" +#include "src/portable.h" +#include "surf/surf_routing.h" #include "surf/datatypes.h" #include "xbt/lib.h" #include "surf/surf_routing.h" -#include "simgrid/platf_interface.h" #include "simgrid/datatypes.h" -#include "simgrid/plugins.h" +#include "simgrid/forward.h" SG_BEGIN_DECL() /* Actions and models are highly connected structures... */ /* user-visible parameters */ -extern double sg_tcp_gamma; -extern double sg_sender_gap; -extern double sg_latency_factor; -extern double sg_bandwidth_factor; -extern double sg_weight_S_parameter; -extern int sg_network_crosstraffic; -extern xbt_dynar_t surf_path; +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; +extern XBT_PRIVATE xbt_dynar_t surf_path; typedef enum { - SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ - SURF_NETWORK_ELEMENT_HOST, /* host type */ - SURF_NETWORK_ELEMENT_ROUTER, /* router type */ - SURF_NETWORK_ELEMENT_AS /* AS type */ + SURF_NETWORK_ELEMENT_HOST=1, /* host type */ + SURF_NETWORK_ELEMENT_ROUTER, /* router type */ + SURF_NETWORK_ELEMENT_AS /* AS type */ } e_surf_network_element_type_t; #ifdef __cplusplus + +namespace simgrid { +namespace surf { + class Model; class CpuModel; class HostModel; @@ -49,33 +52,52 @@ class NetworkModel; class StorageModel; class Resource; class ResourceLmm; -class Host; +class HostImpl; class HostCLM03; class NetworkCm02Link; class Action; class ActionLmm; class StorageActionLmm; class As; -class RoutingEdge; class RoutingPlatf; + +} +} + +typedef simgrid::surf::Model surf_Model; +typedef simgrid::surf::CpuModel surf_CpuModel; +typedef simgrid::surf::HostModel surf_HostModel; +typedef simgrid::surf::VMModel surf_VMModel; +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::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::surf::RoutingPlatf surf_RoutingPlatf; + #else -typedef struct Model Model; -typedef struct CpuModel CpuModel; -typedef struct HostModel HostModel; -typedef struct VMModel VMModel; -typedef struct NetworkModel NetworkModel; -typedef struct StorageModel StorageModel; -typedef struct Resource Resource; -typedef struct ResourceLmm ResourceLmm; -typedef struct HostCLM03 HostCLM03; -typedef struct Host Host; -typedef struct NetworkCm02Link NetworkCm02Link; -typedef struct Action Action; -typedef struct ActionLmm ActionLmm; -typedef struct StorageActionLmm StorageActionLmm; -typedef struct As As; -typedef struct RoutingEdge RoutingEdge; -typedef struct RoutingPlatf RoutingPlatf; + +typedef struct surf_Model surf_Model; +typedef struct surf_CpuModel surf_CpuModel; +typedef struct surf_HostModel surf_HostModel; +typedef struct surf_VMModel surf_VMModel; +typedef struct surf_NetworkModel surf_NetworkModel; +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; + #endif /** @ingroup SURF_c_bindings @@ -84,17 +106,17 @@ typedef struct RoutingPlatf RoutingPlatf; * Generic data structure for a model. The hosts, * the CPUs and the network links are examples of models. */ -typedef Model *surf_model_t; -typedef CpuModel *surf_cpu_model_t; -typedef HostModel *surf_host_model_t; -typedef VMModel *surf_vm_model_t; - -typedef NetworkModel *surf_network_model_t; -typedef StorageModel *surf_storage_model_t; +typedef surf_Model *surf_model_t; +typedef surf_CpuModel *surf_cpu_model_t; +typedef surf_HostModel *surf_host_model_t; +typedef surf_VMModel *surf_vm_model_t; +typedef surf_NetworkModel *surf_network_model_t; +typedef surf_StorageModel *surf_storage_model_t; typedef xbt_dictelm_t surf_resource_t; -typedef Resource *surf_cpp_resource_t; -typedef Host *surf_host_t; +typedef surf_Resource *surf_cpp_resource_t; +typedef surf_Host *surf_host_t; +typedef surf_Cpu *surf_cpu_t; /** @ingroup SURF_c_bindings * \brief Action structure @@ -104,30 +126,11 @@ typedef Host *surf_host_t; * * \see e_surf_action_state_t */ -typedef Action *surf_action_t; - -typedef As *AS_t; -typedef RoutingEdge *routing_edge_t; -typedef RoutingPlatf *routing_platf_t; +typedef surf_Action *surf_action_t; +typedef surf_RoutingPlatf *routing_platf_t; typedef struct surf_file *surf_file_t; -XBT_PUBLIC(e_surf_network_element_type_t) - routing_get_network_element_type(const char* name); - -/** @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 { @@ -136,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 @@ -176,9 +177,6 @@ typedef enum { XBT_PUBLIC_DATA(routing_platf_t) routing_platf; -static inline surf_host_t surf_host_resource_priv(const void *host){ - return (surf_host_t) xbt_lib_get_level((xbt_dictelm_t)host, SURF_HOST_LEVEL); -} static inline void *surf_storage_resource_priv(const void *storage){ return (void*)xbt_lib_get_level((xbt_dictelm_t)storage, SURF_STORAGE_LEVEL); } @@ -187,17 +185,8 @@ static inline void *surf_storage_resource_by_name(const char *name){ return xbt_lib_get_elm_or_null(storage_lib, name); } -XBT_PUBLIC(void *) surf_as_cluster_get_backbone(AS_t as); -XBT_PUBLIC(void) surf_as_cluster_set_backbone(AS_t as, void* backbone); - /** @{ @ingroup SURF_c_bindings */ -/** @brief Get the name of a surf model (dont rely on exact value) - * - * This is implemented using typeid(), so it may change with the compiler - */ -XBT_PUBLIC(const char *) surf_model_name(surf_model_t model); - /** * @brief Pop an action from the done actions set * @@ -214,22 +203,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_done_action_set(surf_model_t model) */ XBT_PUBLIC(surf_action_t) surf_model_extract_failed_action_set(surf_model_t model); -/** - * @brief Pop an action from the ready actions set - * - * @param model The model from which the action is extracted - * @return An action in ready state - */ -XBT_PUBLIC(surf_action_t) surf_model_extract_ready_action_set(surf_model_t model); - -/** - * @brief Pop an action from the running actions set - * - * @param model The model from which the action is extracted - * @return An action in running state - */ -XBT_PUBLIC(surf_action_t) surf_model_extract_running_action_set(surf_model_t model); - /** * @brief Get the size of the running action set of a model * @@ -238,30 +211,8 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_running_action_set(surf_model_t mod */ XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model); -/** - * @brief Execute a parallel task - * @details [long description] - * - * @param model The model which handle the parallelisation - * @param host_nb The number of hosts - * @param host_list The list of hosts on which the task is executed - * @param flops_amount The processing amount (in flop) needed to process - * @param bytes_amount The amount of data (in bytes) needed to transfer - * @param rate [description] - * @return The action corresponding to the parallele execution task - */ -XBT_PUBLIC(surf_action_t) surf_host_model_execute_parallel_task(surf_host_model_t model, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate); - -/** @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, surf_resource_t src, surf_resource_t dst); - /** @brief Create a new VM on the specified host */ -XBT_PUBLIC(void) surf_vm_model_create(const char *name, surf_resource_t host_PM); +XBT_PUBLIC(void) surf_vm_model_create(const char *name, sg_host_t host_PM); /** @brief Create a communication between two hosts * @@ -281,57 +232,24 @@ XBT_PUBLIC(surf_action_t) surf_network_model_communicate(surf_network_model_t mo * @return The name of the surf resource */ XBT_PUBLIC(const char * ) surf_resource_name(surf_cpp_resource_t resource); -static inline const char * surf_cpu_name(surf_cpu_t cpu) { - return surf_resource_name((surf_cpp_resource_t)cpu); -} - -/** @brief Get the properties of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(xbt_dict_t) surf_resource_get_properties(surf_cpp_resource_t resource); -static XBT_INLINE xbt_dict_t surf_host_get_properties(surf_host_t host) { - return surf_resource_get_properties((surf_cpp_resource_t)host); -} - - -/** @brief Get the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(e_surf_resource_state_t) surf_resource_get_state(surf_cpp_resource_t resource); - -static XBT_INLINE e_surf_resource_state_t surf_host_get_state(surf_host_t host) { - return surf_resource_get_state((surf_cpp_resource_t)host); -} - - -/** @brief Set the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(void) surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state); -static inline void surf_host_set_state(surf_host_t host, e_surf_resource_state_t state) { - surf_resource_set_state((surf_cpp_resource_t)host, state); -} - -/** @brief Get the speed of the cpu associated to a host */ -XBT_PUBLIC(double) surf_host_get_speed(surf_resource_t resource, double load); /** @brief Get the available speed of cpu associated to a host */ -XBT_PUBLIC(double) surf_host_get_available_speed(surf_resource_t host); - -/** @brief Get the number of cores of the cpu associated to a host */ -XBT_PUBLIC(int) surf_host_get_core(surf_resource_t host); - -/** @brief Create a computation action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_execute(surf_resource_t host, double size); +XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host); /** @brief Create a sleep action on the given host */ -XBT_PUBLIC(surf_action_t) surf_host_sleep(surf_resource_t host, double duration); +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(surf_resource_t host, const char* fullpath); +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(surf_resource_t host, surf_file_t fd); +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(surf_resource_t host, surf_file_t fd, sg_size_t size); +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(surf_resource_t host, surf_file_t fd, sg_size_t size); +XBT_PUBLIC(surf_action_t) surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size); /** * @brief Get the informations of a file descriptor @@ -346,7 +264,7 @@ XBT_PUBLIC(surf_action_t) surf_host_write(surf_resource_t host, surf_file_t fd, * @param fd The file descriptor * @return An xbt_dynar_t with the file informations */ -XBT_PUBLIC(xbt_dynar_t) surf_host_get_info(surf_resource_t host, surf_file_t fd); +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 @@ -355,7 +273,7 @@ XBT_PUBLIC(xbt_dynar_t) surf_host_get_info(surf_resource_t host, surf_file_t fd) * @param name The mount point * @return The amount of available space in bytes */ -XBT_PUBLIC(sg_size_t) surf_host_get_free_size(surf_resource_t resource, const char* name); +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 @@ -364,47 +282,34 @@ XBT_PUBLIC(sg_size_t) surf_host_get_free_size(surf_resource_t resource, const ch * @param name The mount point * @return The amount of used space in bytes */ -XBT_PUBLIC(sg_size_t) surf_host_get_used_size(surf_resource_t resource, const char* name); - -/** @brief Get the list of VMs hosted on the host */ -XBT_PUBLIC(xbt_dynar_t) surf_host_get_vms(surf_resource_t resource); - -/** @brief Retrieve the params of that VM - * @details You can use fields ramsize and overcommit on a PM, too. - */ -XBT_PUBLIC(void) surf_host_get_params(surf_resource_t resource, vm_params_t params); - -/** @brief Sets the params of that VM/PM - * @details You can use fields ramsize and overcommit on a PM, too. - */ -XBT_PUBLIC(void) surf_host_set_params(surf_resource_t resource, vm_params_t params); +XBT_PUBLIC(sg_size_t) surf_host_get_used_size(sg_host_t resource, const char* name); /** * @brief Destroy a VM * * @param resource The surf vm */ -XBT_PUBLIC(void) surf_vm_destroy(surf_resource_t resource); +XBT_PUBLIC(void) surf_vm_destroy(sg_host_t resource); /** @brief Suspend a VM */ -XBT_PUBLIC(void) surf_vm_suspend(surf_resource_t resource); +XBT_PUBLIC(void) surf_vm_suspend(sg_host_t resource); /** @brief Resume a VM */ -XBT_PUBLIC(void) surf_vm_resume(surf_resource_t resource); +XBT_PUBLIC(void) surf_vm_resume(sg_host_t resource); /** * @brief Save the VM (Not yet implemented) * * @param resource The surf vm */ -XBT_PUBLIC(void) surf_vm_save(surf_resource_t resource); +XBT_PUBLIC(void) surf_vm_save(sg_host_t resource); /** * @brief Restore the VM (Not yet implemented) * * @param resource The surf vm */ -XBT_PUBLIC(void) surf_vm_restore(surf_resource_t resource); +XBT_PUBLIC(void) surf_vm_restore(sg_host_t resource); /** * @brief Migrate the VM to the destination host @@ -412,7 +317,7 @@ XBT_PUBLIC(void) surf_vm_restore(surf_resource_t resource); * @param resource The surf vm * @param ind_vm_ws_dest The destination host */ -XBT_PUBLIC(void) surf_vm_migrate(surf_resource_t resource, surf_resource_t ind_vm_ws_dest); +XBT_PUBLIC(void) surf_vm_migrate(sg_host_t resource, sg_host_t ind_vm_ws_dest); /** * @brief Get the physical machine hosting the VM @@ -420,7 +325,7 @@ XBT_PUBLIC(void) surf_vm_migrate(surf_resource_t resource, surf_resource_t ind_v * @param resource The surf vm * @return The physical machine hosting the VM */ -XBT_PUBLIC(surf_resource_t) surf_vm_get_pm(surf_resource_t resource); +XBT_PUBLIC(sg_host_t) surf_vm_get_pm(sg_host_t resource); /** * @brief [brief description] @@ -429,7 +334,7 @@ XBT_PUBLIC(surf_resource_t) surf_vm_get_pm(surf_resource_t resource); * @param resource [description] * @param bound [description] */ -XBT_PUBLIC(void) surf_vm_set_bound(surf_resource_t resource, double bound); +XBT_PUBLIC(void) surf_vm_set_bound(sg_host_t resource, double bound); /** * @brief [brief description] @@ -439,84 +344,7 @@ XBT_PUBLIC(void) surf_vm_set_bound(surf_resource_t resource, double bound); * @param cpu [description] * @param mask [description] */ -XBT_PUBLIC(void) surf_vm_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask); - -/** - * @brief Execute some quantity of computation - * - * @param cpu The surf cpu - * @param size The value of the processing amount (in flop) needed to process - * @return The surf action corresponding to the processing - */ -XBT_PUBLIC(surf_action_t) surf_cpu_execute(surf_resource_t cpu, double size); - -/** - * @brief Make the cpu sleep for duration (in seconds) - * @details [long description] - * - * @param cpu The surf cpu - * @param duration The number of seconds to sleep - * @return The surf action corresponding to the sleeping - */ -XBT_PUBLIC(surf_action_t) surf_cpu_sleep(surf_resource_t cpu, double duration); - -/** - * @brief Get the host power peak - * @details [long description] - * - * @param host The surf host - * @return The power peak - */ -XBT_PUBLIC(double) surf_host_get_current_power_peak(surf_resource_t host); - -/** - * @brief [brief description] - * @details [long description] - * - * @param host [description] - * @param pstate_index [description] - * - * @return [description] - */ -XBT_PUBLIC(double) surf_host_get_power_peak_at(surf_resource_t host, int pstate_index); - -/** - * @brief [brief description] - * @details [long description] - * - * @param host [description] - * @return [description] - */ -XBT_PUBLIC(int) surf_host_get_nb_pstates(surf_resource_t host); - -XBT_PUBLIC(void) surf_host_set_pstate(surf_resource_t host, int pstate_index); -XBT_PUBLIC(int) surf_host_get_pstate(surf_resource_t host); -XBT_PUBLIC(double) surf_host_get_wattmin_at(surf_resource_t resource, int pstate); -XBT_PUBLIC(double) surf_host_get_wattmax_at(surf_resource_t resource, int pstate); - -/** - * @brief Get the consumed energy (in joules) of an host - * - * @param host The surf host - * @return The consumed energy - */ -XBT_PUBLIC(double) surf_host_get_consumed_energy(surf_resource_t host); - -/** - * @brief Get the list of storages mounted on an host - * - * @param host The surf host - * @return Dictionary of mount point, Storage - */ -XBT_PUBLIC(xbt_dict_t) surf_host_get_mounted_storage_list(surf_resource_t host); - -/** - * @brief Get the list of storages attached to an host - * - * @param host The surf host - * @return Dictionary of storage - */ -XBT_PUBLIC(xbt_dynar_t) surf_host_get_attached_storage_list(surf_resource_t host); +XBT_PUBLIC(void) surf_vm_set_affinity(sg_host_t resource, sg_host_t cpu, unsigned long mask); /** * @brief Unlink a file descriptor @@ -526,7 +354,7 @@ XBT_PUBLIC(xbt_dynar_t) surf_host_get_attached_storage_list(surf_resource_t host * * @return 0 if failed to unlink, 1 otherwise */ -XBT_PUBLIC(int) surf_host_unlink(surf_resource_t host, surf_file_t fd); +XBT_PUBLIC(int) surf_host_unlink(sg_host_t host, surf_file_t fd); /** * @brief Get the size of a file on a host @@ -536,7 +364,7 @@ XBT_PUBLIC(int) surf_host_unlink(surf_resource_t host, surf_file_t fd); * * @return The size in bytes of the file */ -XBT_PUBLIC(size_t) surf_host_get_size(surf_resource_t host, surf_file_t fd); +XBT_PUBLIC(size_t) surf_host_get_size(sg_host_t host, surf_file_t fd); /** * @brief Get the current position of the file descriptor @@ -545,7 +373,7 @@ XBT_PUBLIC(size_t) surf_host_get_size(surf_resource_t host, surf_file_t fd); * @param fd The file descriptor * @return The current position of the file descriptor */ -XBT_PUBLIC(size_t) surf_host_file_tell(surf_resource_t host, surf_file_t fd); +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*. @@ -557,7 +385,7 @@ XBT_PUBLIC(size_t) surf_host_file_tell(surf_resource_t host, surf_file_t fd); * * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED */ -XBT_PUBLIC(int) surf_host_file_move(surf_resource_t host, surf_file_t fd, const char* fullpath); +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 @@ -572,7 +400,7 @@ XBT_PUBLIC(int) surf_host_file_move(surf_resource_t host, surf_file_t fd, const * - SEEK_END: end of the file * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED */ -XBT_PUBLIC(int) surf_host_file_seek(surf_resource_t host, +XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin); @@ -608,119 +436,8 @@ XBT_PUBLIC(sg_size_t) surf_storage_get_free_size(surf_resource_t resource); */ XBT_PUBLIC(sg_size_t) surf_storage_get_used_size(surf_resource_t resource); - -/** - * @brief Get the data associated to the action - * - * @param action The surf action - * @return The data associated to the action - */ -XBT_PUBLIC(void*) surf_action_get_data(surf_action_t action); - -/** - * @brief Set the data associated to the action - * @details [long description] - * - * @param action The surf action - * @param data The new data associated to the action - */ -XBT_PUBLIC(void) surf_action_set_data(surf_action_t action, void *data); - -/** - * @brief Unreference an action - * - * @param action The surf action - */ -XBT_PUBLIC(void) surf_action_unref(surf_action_t action); - -/** - * @brief Get the start time of an action - * - * @param action The surf action - * @return The start time in seconds from the beginning of the simulation - */ -XBT_PUBLIC(double) surf_action_get_start_time(surf_action_t action); - -/** - * @brief Get the finish time of an action - * - * @param action The surf action - * @return The finish time in seconds from the beginning of the simulation - */ -XBT_PUBLIC(double) surf_action_get_finish_time(surf_action_t action); - -/** - * @brief Get the remains amount of work to do of an action - * - * @param action The surf action - * @return The remains amount of work to do - */ -XBT_PUBLIC(double) surf_action_get_remains(surf_action_t action); - -/** - * @brief Suspend an action - * - * @param action The surf action - */ -XBT_PUBLIC(void) surf_action_suspend(surf_action_t action); - -/** - * @brief Resume an action - * - * @param action The surf action - */ -XBT_PUBLIC(void) surf_action_resume(surf_action_t action); - -/** - * @brief Cancel an action - * - * @param action The surf action - */ -XBT_PUBLIC(void) surf_action_cancel(surf_action_t action); - -/** - * @brief Set the priority of an action - * @details [long description] - * - * @param action The surf action - * @param priority The new priority [TODO] - */ -XBT_PUBLIC(void) surf_action_set_priority(surf_action_t action, double priority); - -/** - * @brief Set the category of an action - * @details [long description] - * - * @param action The surf action - * @param category The new category of the action - */ -XBT_PUBLIC(void) surf_action_set_category(surf_action_t action, const char *category); - -/** - * @brief Get the state of an action - * - * @param action The surf action - * @return The state of the action - */ -XBT_PUBLIC(e_surf_action_state_t) surf_action_get_state(surf_action_t action); - -/** - * @brief Get the cost of an action - * - * @param action The surf action - * @return The cost of the action - */ -XBT_PUBLIC(double) surf_action_get_cost(surf_action_t action); - -/** - * @brief [brief desrciption] - * @details [long description] - * - * @param action The surf cpu action - * @param cpu [description] - * @param mask [description] - */ -XBT_PUBLIC(void) surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask); +/** @brief return the properties set associated to that storage */ +XBT_PUBLIC(xbt_dict_t) surf_storage_get_properties(surf_resource_t resource); /** * @brief [brief description] @@ -761,11 +478,10 @@ XBT_PUBLIC(xbt_dict_t) surf_storage_action_get_ls_dict(surf_action_t action); * * @param resource The surf storage * @return The host name + * may not exist. */ XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource); -XBT_PUBLIC(surf_model_t) surf_resource_model(const void *host, int level); - /** @} */ /**************************************/ @@ -1045,11 +761,10 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) /** \ingroup SURF_models * \brief List of initialized models */ -XBT_PUBLIC_DATA(xbt_dynar_t) model_list; -XBT_PUBLIC_DATA(xbt_dynar_t) model_list_invoke; +XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models; /** \ingroup SURF_simulation - * \brief List of hosts that have juste restarted and whose autorestart process should be restarted. + * \brief List of hosts that have just restarted and whose autorestart process should be restarted. */ XBT_PUBLIC_DATA(xbt_dynar_t) host_that_restart; @@ -1064,12 +779,9 @@ XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib; XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void); XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as); XBT_PUBLIC_DATA(AS_t) surf_AS_get_by_name(const char * name); -XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_routing_sons(AS_t as); -XBT_PUBLIC_DATA(const char *) surf_AS_get_model(AS_t as); +XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_children(AS_t as); XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as); XBT_PUBLIC_DATA(void) surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges); -XBT_PUBLIC_DATA(AS_t) surf_platf_get_root(routing_platf_t platf); -XBT_PUBLIC_DATA(e_surf_network_element_type_t) surf_routing_edge_get_rc_type(sg_routing_edge_t edge); /*******************************************/ /*** SURF Globals **************************/ @@ -1136,20 +848,9 @@ 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_DATA(xbt_dict_t) trace_connect_list_host_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; - - -XBT_PUBLIC(double) get_cpu_power(const char *power); XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name); -int surf_get_nthreads(void); -void surf_set_nthreads(int nthreads); - /* * Returns the initial path. On Windows the initial path is * the current directory for the current process in the other @@ -1174,5 +875,6 @@ int instr_platform_traced (void); xbt_graph_t instr_routing_platform_graph (void); void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename); + SG_END_DECL() #endif /* _SURF_SURF_H */