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
simplication and uniformization
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
5fb3125
..
53b7503
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-6,11
+6,9
@@
#include "storage_n11.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "storage_n11.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/surf/xml/platf.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "
xbt/utility
.hpp"
-#include
<cmath> /*ceil*/
+#include "
src/surf/xml/platf
.hpp"
+#include
"surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
@@
-19,24
+17,18
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
*************/
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
*************/
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-
static
void check_disk_attachment()
+void check_disk_attachment()
{
for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
if (not host_elm)
{
for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
if (not host_elm)
- surf_parse_error(std::string("Unable to attach storage ") + s->get
C
name() + ": host " +
+ surf_parse_error(std::string("Unable to attach storage ") + s->get
_c
name() + ": host " +
s->getImpl()->getHost().c_str() + " does not exist.");
else
s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
}
}
s->getImpl()->getHost().c_str() + " does not exist.");
else
s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
}
}
-void storage_register_callbacks()
-{
- simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
- instr_routing_define_callbacks();
-}
-
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-61,7
+53,7
@@
StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id,
"property Bwrite, storage", type_id.c_str());
StorageImpl* storage =
"property Bwrite, storage", type_id.c_str());
StorageImpl* storage =
- new StorageN11(this, id,
maxmin_system_
, Bread, Bwrite, type_id, content_name, storage_type->size, attach);
+ new StorageN11(this, id,
get_maxmin_system()
, Bread, Bwrite, type_id, content_name, storage_type->size, attach);
storageCreatedCallbacks(storage);
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
storageCreatedCallbacks(storage);
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
@@
-70,22
+62,22
@@
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
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
V
ariable()->get_value() * delta));
+ action.update_remains(lrint(action.get
_v
ariable()->get_value() * delta));
if (action.get_max_duration() > NO_MAX_DURATION)
action.update_max_duration(delta);
if (action.get_max_duration() > NO_MAX_DURATION)
action.update_max_duration(delta);
- if (((action.get_remains_no_update() <= 0) && (action.get
V
ariable()->get_weight() > 0)) ||
+ if (((action.get_remains_no_update() <= 0) && (action.get
_v
ariable()->get_weight() > 0)) ||
((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::done);
}
((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::done);
}
@@
-106,12
+98,12
@@
StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::Syste
StorageAction* StorageN11::read(sg_size_t size)
{
StorageAction* StorageN11::read(sg_size_t size)
{
- return new StorageN11Action(
model(), size, isO
ff(), this, READ);
+ return new StorageN11Action(
get_model(), size, is_o
ff(), this, READ);
}
StorageAction* StorageN11::write(sg_size_t size)
{
}
StorageAction* StorageN11::write(sg_size_t size)
{
- return new StorageN11Action(
model(), size, isO
ff(), this, WRITE);
+ return new StorageN11Action(
get_model(), size, is_o
ff(), this, WRITE);
}
/**********
}
/**********
@@
-120,18
+112,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->get
C
name(), cost);
+ XBT_IN("(%s,%g", storage->get
_c
name(), cost);
// Must be less than the max bandwidth for all actions
// Must be less than the max bandwidth for all actions
- model->get
MaxminSystem()->expand(storage->constraint(), getV
ariable(), 1.0);
+ model->get
_maxmin_system()->expand(storage->get_constraint(), get_v
ariable(), 1.0);
switch(type) {
case READ:
switch(type) {
case READ:
- model->get
MaxminSystem()->expand(storage->constraintRead_, getV
ariable(), 1.0);
+ model->get
_maxmin_system()->expand(storage->constraintRead_, get_v
ariable(), 1.0);
break;
case WRITE:
break;
case WRITE:
- model->get
MaxminSystem()->expand(storage->constraintWrite_, getV
ariable(), 1.0);
+ model->get
_maxmin_system()->expand(storage->constraintWrite_, get_v
ariable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
break;
default:
THROW_UNIMPLEMENTED;
@@
-148,7
+140,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
MaxminSystem()->update_variable_weight(getV
ariable(), 0.0);
+ get_model()->get
_maxmin_system()->update_variable_weight(get_v
ariable(), 0.0);
suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();
suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();
@@
-159,11
+151,6
@@
void StorageN11Action::resume()
THROW_UNIMPLEMENTED;
}
THROW_UNIMPLEMENTED;
}
-bool StorageN11Action::isSuspended()
-{
- return suspended_ == Action::SuspendStates::suspended;
-}
-
void StorageN11Action::set_max_duration(double /*duration*/)
{
THROW_UNIMPLEMENTED;
void StorageN11Action::set_max_duration(double /*duration*/)
{
THROW_UNIMPLEMENTED;