A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement ExecImpl::remainingRatio and make sure we never call ExecImpl::remaining...
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
9da1734
..
a1ee65d
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-12,6
+12,7
@@
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
#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);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
@@
-34,8
+35,8
@@
namespace simgrid {
namespace surf {
HostL07Model::HostL07Model() : HostModel() {
namespace surf {
HostL07Model::HostL07Model() : HostModel() {
- maxminSystem_ = new s
_lmm_system_t
(true /* lazy */);
- maxminSystem_->solve_fun = &bottleneck_solve;
+ maxminSystem_ = new s
imgrid::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_);
}
surf_network_model = new NetworkL07Model(this,maxminSystem_);
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
@@
-48,9
+49,7
@@
HostL07Model::~HostL07Model()
delete surf_cpu_model_pm;
}
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_ = sys;
}
@@
-60,9
+59,7
@@
CpuL07Model::~CpuL07Model()
maxminSystem_ = nullptr;
}
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);
{
maxminSystem_ = sys;
loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
@@
-294,8
+291,8
@@
bool CpuL07::isUsed(){
/** @brief take into account changes of speed (either load or max) */
void CpuL07::onSpeedChange() {
/** @brief take into account changes of speed (either load or max) */
void CpuL07::onSpeedChange() {
- lmm_variable_t var = nullptr;
- lmm_element_t elem = nullptr;
+ lmm_variable_t var
= nullptr;
+
const_
lmm_element_t elem = nullptr;
model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
while ((var = constraint()->get_variable(&elem))) {
model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
while ((var = constraint()->get_variable(&elem))) {
@@
-365,7
+362,7
@@
void LinkL07::setLatency(double value)
{
lmm_variable_t var = nullptr;
L07Action *action;
{
lmm_variable_t var = nullptr;
L07Action *action;
- lmm_element_t elem = nullptr;
+
const_
lmm_element_t elem = nullptr;
latency_.peak = value;
while ((var = constraint()->get_variable(&elem))) {
latency_.peak = value;
while ((var = constraint()->get_variable(&elem))) {
@@
-420,7
+417,7
@@
int L07Action::unref()
refcount_--;
if (not refcount_) {
if (action_hook.is_linked())
refcount_--;
if (not refcount_) {
if (action_hook.is_linked())
- s
tateSet_->erase(stateSet_->iterator_to(*this)
);
+ s
imgrid::xbt::intrusive_erase(*stateSet_, *this
);
if (getVariable())
getModel()->getMaxminSystem()->variable_free(getVariable());
delete this;
if (getVariable())
getModel()->getMaxminSystem()->variable_free(getVariable());
delete this;