X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c84dc84beaec1cdcf7a49f1247cbc390414feaa0..6d3a11c0eb39811cd3aafb3193a909bd2413dfff:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 0849c4368a..9307cd3a00 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -52,7 +52,7 @@ public: HostModel() : Model() {} ~HostModel() override {} - HostImpl *createHost(const char *name, routing::NetCard *net, Cpu *cpu); + HostImpl *createHost(const char *name, kernel::routing::NetCard *net, Cpu *cpu); virtual void adjustWeightOfDummyCpuActions(); virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list, @@ -75,7 +75,6 @@ public: static simgrid::xbt::Extension EXTENSION_ID; public: - static void classInit(); // must be called before the first use of that class /** * @brief Host constructor * @@ -227,9 +226,9 @@ public: {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource public: - xbt_dynar_t p_storage; - Cpu *p_cpu; - simgrid::s4u::Host* piface = nullptr; + xbt_dynar_t storage_; + Cpu *cpu_; + simgrid::s4u::Host* piface_ = nullptr; /** @brief Get the list of virtual machines on the current Host */ xbt_dynar_t getVms(); @@ -240,9 +239,9 @@ public: void getParams(vm_params_t params); /** @brief Sets the params of that VM/PM */ void setParams(vm_params_t params); - simgrid::s4u::Host* getHost() { return piface; } + simgrid::s4u::Host* getHost() { return piface_; } private: - s_vm_params_t p_params; + s_vm_params_t params_; }; }