X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6891978f752ac5655597efb35ab4505f5181f572..d8d122c3f5f13f494067f09a2daddfc091e4272a:/src/surf/host_interface.hpp diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 685925d237..ed143b8836 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,6 +9,8 @@ #include "cpu_interface.hpp" #include "network_interface.hpp" +#include + #ifndef SURF_HOST_INTERFACE_HPP_ #define SURF_HOST_INTERFACE_HPP_ @@ -16,9 +18,12 @@ * Classes * ***********/ -class HostModel; -class Host; -class HostAction; +namespace simgrid { +namespace surf { + +class XBT_PRIVATE HostModel; +class XBT_PRIVATE Host; +class XBT_PRIVATE HostAction; /************* * Callbacks * @@ -44,16 +49,22 @@ XBT_PUBLIC_DATA(surf_callback(void, Host*, e_surf_resource_state_t, e_surf_resou */ XBT_PUBLIC_DATA(surf_callback(void, HostAction*, e_surf_action_state_t, e_surf_action_state_t)) hostActionStateChangedCallbacks; +} +} + /********* * Tools * *********/ -XBT_PUBLIC_DATA(HostModel*) surf_host_model; -XBT_PUBLIC(void) host_parse_init(sg_platf_host_cbarg_t host); +XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model; XBT_PUBLIC(void) host_add_traces(); /********* * Model * *********/ + +namespace simgrid { +namespace surf { + /** @ingroup SURF_host_interface * @brief SURF Host model interface class * @details A model is an object which handle the interactions between its Resources and its Actions @@ -63,7 +74,7 @@ public: HostModel() : Model() {} ~HostModel() {} - virtual Host *createHost(const char *name)=0; + virtual Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu)=0; void addTraces(){DIE_IMPOSSIBLE;} virtual void adjustWeightOfDummyCpuActions(); @@ -83,8 +94,10 @@ public: * @brief SURF Host interface class * @details An host represents a machine with a aggregation of a Cpu, a Link and a Storage */ -class Host : public Resource { +class Host : public simgrid::surf::Resource { public: + static simgrid::xbt::FacetLevel LEVEL; + static void init(); /** * @brief Host constructor * @@ -95,7 +108,7 @@ public: * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - Host(Model *model, const char *name, xbt_dict_t props, + Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); /** @@ -109,13 +122,14 @@ public: * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - Host(Model *model, const char *name, xbt_dict_t props, + Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); /** @brief Host destructor */ - ~ Host(); + ~Host(); + void attach(simgrid::Host* host); void setState(e_surf_resource_state_t state); /** @@ -143,65 +157,13 @@ public: */ virtual Action *sleep(double duration)=0; - /** - * @brief Get the number of cores of the associated Cpu - * - * @return The number of cores of the associated Cpu - * @see Cpu - */ - virtual int getCore(); - - /** - * @brief Get the speed of the associated Cpu - * - * @param load [TODO] - * @return The speed of the associated Cpu - * @see Cpu - */ - virtual double getSpeed(double load); - - /** - * @brief Get the available speed of the associated Cpu - * @details [TODO] - * - * @return The available speed of the associated Cpu - * @see Cpu - */ - virtual double getAvailableSpeed(); - - /** - * @brief Get the associated Cpu power peak - * - * @return The associated Cpu power peak - * @see Cpu - */ - virtual double getCurrentPowerPeak(); + /** @brief Return the storage of corresponding mount point */ + virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); - virtual double getPowerPeakAt(int pstate_index); - virtual int getNbPstates(); - virtual void setPstate(int pstate_index); - virtual int getPstate(); - - /** - * @brief Return the storage of corresponding mount point - * - * @param storage The mount point - * @return The corresponding Storage - */ - virtual Storage *findStorageOnMountList(const char* storage); - - /** - * @brief Get the xbt_dict_t of mount_point: Storage - * - * @return The xbt_dict_t of mount_point: Storage - */ + /** @brief Get the xbt_dict_t of mount_point: Storage */ virtual xbt_dict_t getMountedStorageList(); - /** - * @brief Get the xbt_dynar_t of storages attached to the Host - * - * @return The xbt_dynar_t of Storage names - */ + /** @brief Get the xbt_dynar_t of storages attached to the Host */ virtual xbt_dynar_t getAttachedStorageList(); /** @@ -306,31 +268,19 @@ public: xbt_dynar_t p_storage; RoutingEdge *p_netElm; Cpu *p_cpu; + simgrid::Host* p_host = nullptr; - /** - * @brief Get the list of virtual machines on the current Host - * - * @return The list of VMs - */ + /** @brief Get the list of virtual machines on the current Host */ xbt_dynar_t getVms(); /* common with vm */ - /** - * @brief [brief description] - * @details [long description] - * - * @param params [description] - */ - void getParams(ws_params_t params); - - /** - * @brief [brief description] - * @details [long description] - * - * @param params [description] - */ - void setParams(ws_params_t params); - s_ws_params_t p_params; + /** @brief Retrieve a copy of the parameters of that VM/PM + * @details The ramsize and overcommit fields are used on the PM too */ + void getParams(vm_params_t params); + /** @brief Sets the params of that VM/PM */ + void setParams(vm_params_t params); +private: + s_vm_params_t p_params; }; /********** @@ -349,7 +299,7 @@ public: * @param cost The cost of this HostAction in [TODO] * @param failed [description] */ - HostAction(Model *model, double cost, bool failed) + HostAction(simgrid::surf::Model *model, double cost, bool failed) : Action(model, cost, failed) {} /** @@ -360,11 +310,13 @@ public: * @param failed [description] * @param var The lmm variable associated to this StorageAction if it is part of a LMM component */ - HostAction(Model *model, double cost, bool failed, lmm_variable_t var) + HostAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {} void setState(e_surf_action_state_t state); }; +} +} #endif /* SURF_Host_INTERFACE_HPP_ */