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
start snake_casing resource::Model
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
2e3c492
..
9a7e82c
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-70,14
+70,14
@@
StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id,
return storage;
}
return storage;
}
-double StorageN11Model::next
OccuringE
vent(double now)
+double StorageN11Model::next
_occuring_e
vent(double now)
{
{
- return StorageModel::next
OccuringEventF
ull(now);
+ return StorageModel::next
_occuring_event_f
ull(now);
}
}
-void StorageN11Model::update
ActionsS
tate(double /*now*/, double delta)
+void StorageN11Model::update
_actions_s
tate(double /*now*/, double delta)
{
{
- for (auto it = std::begin(*get
RunningActionSet()); it != std::end(*getRunningActionS
et());) {
+ for (auto it = std::begin(*get
_running_action_set()); it != std::end(*get_running_action_s
et());) {
StorageAction& action = static_cast<StorageAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
action.update_remains(lrint(action.get_variable()->get_value() * delta));
StorageAction& action = static_cast<StorageAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
action.update_remains(lrint(action.get_variable()->get_value() * delta));
@@
-120,18
+120,18
@@
StorageAction* StorageN11::write(sg_size_t size)
StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
- : StorageAction(model, cost, failed, model->get
MaxminS
ystem()->variable_new(this, 1.0, -1.0, 3), storage, type)
+ : StorageAction(model, cost, failed, model->get
_maxmin_s
ystem()->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
- model->get
MaxminS
ystem()->expand(storage->constraint(), get_variable(), 1.0);
+ model->get
_maxmin_s
ystem()->expand(storage->constraint(), get_variable(), 1.0);
switch(type) {
case READ:
switch(type) {
case READ:
- model->get
MaxminS
ystem()->expand(storage->constraintRead_, get_variable(), 1.0);
+ model->get
_maxmin_s
ystem()->expand(storage->constraintRead_, get_variable(), 1.0);
break;
case WRITE:
break;
case WRITE:
- model->get
MaxminS
ystem()->expand(storage->constraintWrite_, get_variable(), 1.0);
+ model->get
_maxmin_s
ystem()->expand(storage->constraintWrite_, get_variable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
break;
default:
THROW_UNIMPLEMENTED;
@@
-148,7
+148,7
@@
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
if (suspended_ != Action::SuspendStates::sleeping) {
{
XBT_IN("(%p)", this);
if (suspended_ != Action::SuspendStates::sleeping) {
- get_model()->get
MaxminS
ystem()->update_variable_weight(get_variable(), 0.0);
+ get_model()->get
_maxmin_s
ystem()->update_variable_weight(get_variable(), 0.0);
suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();
suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();