#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
+#include "xbt/utility.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
namespace surf {
HostL07Model::HostL07Model() : HostModel() {
- maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(true /* lazy */);
+ maxminSystem_ = new simgrid::kernel::lmm::System(true /* lazy */);
maxminSystem_->solve_fun = &simgrid::kernel::lmm::bottleneck_solve;
surf_network_model = new NetworkL07Model(this,maxminSystem_);
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
HostL07Model::~HostL07Model()
{
- delete maxminSystem_;
- maxminSystem_ = nullptr;
delete surf_network_model;
delete surf_cpu_model_pm;
}
-CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
- : CpuModel()
- , hostModel_(hmodel)
+CpuL07Model::CpuL07Model(HostL07Model* hmodel, lmm_system_t sys) : CpuModel(), hostModel_(hmodel)
{
maxminSystem_ = sys;
}
maxminSystem_ = nullptr;
}
-NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
- : NetworkModel()
- , hostModel_(hmodel)
+NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys) : NetworkModel(), hostModel_(hmodel)
{
maxminSystem_ = sys;
loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
/** @brief take into account changes of speed (either load or max) */
void CpuL07::onSpeedChange() {
- lmm_variable_t var = nullptr;
+ lmm_variable_t var = nullptr;
const_lmm_element_t elem = nullptr;
model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
refcount_--;
if (not refcount_) {
if (action_hook.is_linked())
- stateSet_->erase(stateSet_->iterator_to(*this));
+ simgrid::xbt::intrusive_erase(*stateSet_, *this);
if (getVariable())
getModel()->getMaxminSystem()->variable_free(getVariable());
delete this;