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
[SMPI] Clarify in debug message that SMPI processes are meant, not SIMIX.
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
71ee41d
..
130879d
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-5,7
+5,9
@@
#include "storage_n11.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "storage_n11.hpp"
#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetPoint.hpp"
+#include "xbt/utility.hpp"
#include <cmath> /*ceil*/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
#include <cmath> /*ceil*/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
@@
-78,12
+80,12
@@
void StorageN11Model::updateActionsState(double /*now*/, double delta)
for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) {
StorageAction& action = static_cast<StorageAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) {
StorageAction& action = static_cast<StorageAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
- action.updateRemains(lrint(
lmm_variable_getvalue(action.getVariable()
) * delta));
+ action.updateRemains(lrint(
action.getVariable()->get_value(
) * delta));
if (action.getMaxDuration() > NO_MAX_DURATION)
action.updateMaxDuration(delta);
if (action.getMaxDuration() > NO_MAX_DURATION)
action.updateMaxDuration(delta);
- if (((action.getRemainsNoUpdate() <= 0) && (
lmm_get_variable_weight(action.getVariable()
) > 0)) ||
+ if (((action.getRemainsNoUpdate() <= 0) && (
action.getVariable()->get_weight(
) > 0)) ||
((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) {
action.finish(Action::State::done);
}
((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) {
action.finish(Action::State::done);
}
@@
-118,18
+120,18
@@
StorageAction* StorageN11::write(sg_size_t size)
StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
- : StorageAction(model, cost, failed,
lmm_variable_new(model->getMaxminSystem(),
this, 1.0, -1.0, 3), storage, type)
+ : StorageAction(model, cost, failed,
model->getMaxminSystem()->variable_new(
this, 1.0, -1.0, 3), storage, type)
{
XBT_IN("(%s,%g", storage->getCname(), cost);
// Must be less than the max bandwidth for all actions
{
XBT_IN("(%s,%g", storage->getCname(), cost);
// Must be less than the max bandwidth for all actions
-
lmm_expand(model->getMaxminSystem(),
storage->constraint(), getVariable(), 1.0);
+
model->getMaxminSystem()->expand(
storage->constraint(), getVariable(), 1.0);
switch(type) {
case READ:
switch(type) {
case READ:
-
lmm_expand(model->getMaxminSystem(),
storage->constraintRead_, getVariable(), 1.0);
+
model->getMaxminSystem()->expand(
storage->constraintRead_, getVariable(), 1.0);
break;
case WRITE:
break;
case WRITE:
-
lmm_expand(model->getMaxminSystem(),
storage->constraintWrite_, getVariable(), 1.0);
+
model->getMaxminSystem()->expand(
storage->constraintWrite_, getVariable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
break;
default:
THROW_UNIMPLEMENTED;
@@
-142,9
+144,9
@@
int StorageN11Action::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())
if (getVariable())
-
lmm_variable_free(getModel()->getMaxminSystem(),
getVariable());
+
getModel()->getMaxminSystem()->variable_free(
getVariable());
xbt_free(getCategory());
delete this;
return 1;
xbt_free(getCategory());
delete this;
return 1;
@@
-161,7
+163,7
@@
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
if (suspended_ != 2) {
{
XBT_IN("(%p)", this);
if (suspended_ != 2) {
-
lmm_update_variable_weight(getModel()->getMaxminSystem(),
getVariable(), 0.0);
+
getModel()->getMaxminSystem()->update_variable_weight(
getVariable(), 0.0);
suspended_ = 1;
}
XBT_OUT();
suspended_ = 1;
}
XBT_OUT();