X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5a5b0f6ee35cb592f9345a9dafa0e29df8477ef..b99c0d78b25704a61225be8a8b5c47b246afe22a:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index d63b9d302d..dae5142808 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -41,29 +41,21 @@ namespace surf { class Model; class CpuModel; class HostModel; -class VMModel; class NetworkModel; class StorageModel; class Resource; class ResourceLmm; -class HostImpl; 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::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; @@ -74,14 +66,12 @@ 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 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; @@ -92,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 @@ -105,7 +94,6 @@ typedef struct surf_RoutingPlatf surf_RoutingPlatf; 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; @@ -123,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; @@ -140,24 +127,10 @@ typedef struct surf_model_description* 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); -/** @ingroup SURF_vm_interface */ -/* FIXME: Where should the VM state be defined? */ -typedef enum { - SURF_VM_STATE_CREATED, /**< created, but not yet started */ - SURF_VM_STATE_RUNNING, - SURF_VM_STATE_SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */ - - SURF_VM_STATE_SAVING, /**< Save/restore involves disk I/O, so there should be transition states. */ - SURF_VM_STATE_SAVED, - SURF_VM_STATE_RESTORING, -} e_surf_vm_state_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); } @@ -192,23 +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 new VM on the specified host */ -XBT_PUBLIC(void) surf_vm_model_create(const char *name, sg_host_t host_PM); - -/** @brief Create a communication between two hosts - * - * @param model The model which handle the communication - * @param src The source host - * @param dst The destination host - * @param size The amount of data (in bytes) needed to transfer - * @param rate [description] - * @return The action corresponding to the communication - */ -XBT_PUBLIC(surf_action_t) surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate); - -/** @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); @@ -254,58 +210,6 @@ XBT_PUBLIC(sg_size_t) surf_host_get_free_size(sg_host_t resource, const char* na */ 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(sg_host_t resource); - -/** @brief Suspend a VM */ -XBT_PUBLIC(void) surf_vm_suspend(sg_host_t resource); - -/** @brief Resume a VM */ -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(sg_host_t resource); - -/** - * @brief Restore the VM (Not yet implemented) - * - * @param resource The surf vm - */ -XBT_PUBLIC(void) surf_vm_restore(sg_host_t resource); - -/** - * @brief Migrate the VM to the destination host - * - * @param resource The surf vm - * @param ind_vm_ws_dest The destination host - */ -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 - * - * @param resource The surf vm - * @return The physical machine hosting the VM - */ -XBT_PUBLIC(sg_host_t) surf_vm_get_pm(sg_host_t resource); - -/** - * @brief [brief description] - * @details [long description] - * - * @param resource [description] - * @param bound [description] - */ -XBT_PUBLIC(void) surf_vm_set_bound(sg_host_t resource, double bound); - /** * @brief Unlink a file descriptor * @@ -446,8 +350,6 @@ XBT_PUBLIC(const char * ) surf_storage_get_host(surf_resource_t resource); /* Implementations of model object */ /**************************************/ -XBT_PUBLIC_DATA(void_f_void_t) surf_cpu_model_init_preparse; - /** \ingroup SURF_models * \brief The CPU model object for the physical machine layer */ @@ -551,7 +453,6 @@ XBT_PUBLIC(void) surf_network_model_init_Constant(); */ XBT_PUBLIC(void) surf_network_model_init_CM02(); -#if HAVE_NS3 /** \ingroup SURF_models * \brief Initializes the platform with the network model NS3 * @@ -561,7 +462,6 @@ XBT_PUBLIC(void) surf_network_model_init_CM02(); * \see surf_host_model_init_NS3() */ XBT_PUBLIC(void) surf_network_model_init_NS3(); -#endif /** \ingroup SURF_models * \brief Initializes the platform with the network model Reno @@ -628,14 +528,6 @@ XBT_PUBLIC_DATA(surf_storage_model_t) surf_storage_model; */ XBT_PUBLIC_DATA(surf_host_model_t) surf_host_model; -/** \ingroup SURF_models - * \brief The vm model - * - * Note that when you create an API on top of SURF,the vm model should be the only one you use - * because depending on the platform model, the network model and the CPU model may not exist. - */ -XBT_PUBLIC_DATA(surf_vm_model_t) surf_vm_model; - /** \ingroup SURF_models * \brief Initializes the platform with a compound host model * @@ -676,16 +568,6 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_host_model_description[]; */ XBT_PUBLIC(void) surf_vm_model_init_HL13(); -/** \ingroup SURF_models - * \brief The list of all available vm model models - */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_vm_model_description[]; - -/** \ingroup SURF_simulation - * \brief List of hosts that have just restarted and whose autorestart process should be restarted. - */ -XBT_PUBLIC_DATA(xbt_dynar_t) host_that_restart; - /** \ingroup SURF_simulation * \brief List of hosts for which one want to be notified if they ever restart. */ @@ -751,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.