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
NS3: be explicit when ignoring long routes
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
ac0cf23
..
a963b8c
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-45,22
+45,34
@@
HostL07Model::~HostL07Model()
{
lmm_system_free(maxminSystem_);
maxminSystem_ = nullptr;
+ delete surf_network_model;
+ delete surf_cpu_model_pm;
}
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
: CpuModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- }
+{
+ maxminSystem_ = sys;
+}
+
+CpuL07Model::~CpuL07Model()
+{
+ maxminSystem_ = nullptr;
+}
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
: NetworkModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
- }
+{
+ maxminSystem_ = sys;
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
+}
+
+NetworkL07Model::~NetworkL07Model()
+{
+ maxminSystem_ = nullptr;
+}
double HostL07Model::nextOccuringEvent(double now)
{
@@
-96,7
+108,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
} else {
action->latency_ = 0.0;
}
- if ((action->latency_
=
= 0.0) && (action->isSuspended() == 0)) {
+ if ((action->latency_
<
= 0.0) && (action->isSuspended() == 0)) {
action->updateBound();
lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0);
}
@@
-105,7
+117,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta);
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->getMaxDuration()
!=
NO_MAX_DURATION)
+ if (action->getMaxDuration()
>
NO_MAX_DURATION)
action->updateMaxDuration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains());
@@
-117,7
+129,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
*/
if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
- ((action->getMaxDuration()
!=
NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
+ ((action->getMaxDuration()
>
NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
} else {
@@
-314,7
+326,8
@@
bool LinkL07::isUsed(){
return lmm_constraint_used(model()->getMaxminSystem(), constraint());
}
-void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
+void CpuL07::apply_event(tmgr_trace_event_t triggered, double value)
+{
XBT_DEBUG("Updating cpu %s (%p) with value %g", cname(), this, value);
if (triggered == speed_.event) {
speed_.scale = value;
@@
-333,7
+346,8
@@
void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
}
}
-void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) {
+void LinkL07::apply_event(tmgr_trace_event_t triggered, double value)
+{
XBT_DEBUG("Updating link %s (%p) with value=%f", cname(), this, value);
if (triggered == bandwidth_.event) {
setBandwidth(value);
@@
-407,7
+421,7
@@
void L07Action::updateBound()
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_
=
= 0.0) && (suspended_ == 0)) {
+ if ((latency_
<
= 0.0) && (suspended_ == 0)) {
if (rate_ < 0)
lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else