X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc8857bd24b1a222e1d1466a34d7f17bc9513544..56626375ca41dbdd49fd486226f3da3104233dcb:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index ea2b4bdcfa..c4cf703959 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -46,7 +46,6 @@ class NetworkModel; class StorageModel; class Resource; class ResourceLmm; -class HostImpl; class HostCLM03; class NetworkCm02Link; class Action; @@ -140,18 +139,6 @@ 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 */ /***************************/ @@ -192,17 +179,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 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); @@ -436,8 +412,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 */