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
Merge branch 'master' into CRTP
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
03b1cff
..
668366d
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-7,67
+7,63
@@
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.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);
/*************
* CallBacks *
*************/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
* CallBacks *
*************/
-extern std::map<std::string, simgrid::
surf
::StorageType*> storage_types;
+extern std::map<std::string, simgrid::
kernel::resource
::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());
+ for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
+ simgrid::kernel::routing::NetPoint* host_elm =
+ simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(s->get_impl()->get_host());
if (not host_elm)
if (not host_elm)
- surf_parse_error(std::string("Unable to attach storage ") + s->get
C
name() + ": host " +
- s->get
Impl()->getHost().c_str
() + " does not exist.");
+ surf_parse_error(std::string("Unable to attach storage ") + s->get
_c
name() + ": host " +
+ s->get
_impl()->get_host
() + " does not exist.");
else
else
- s->
attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str(
));
+ s->
set_host(simgrid::s4u::Host::by_name(s->get_impl()->get_host()
));
}
}
}
}
-void storage_register_callbacks()
-{
- simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
- instr_routing_define_callbacks();
-}
-
/*********
* Model *
*********/
void surf_storage_model_init_default()
{
/*********
* Model *
*********/
void surf_storage_model_init_default()
{
- surf_storage_model = new simgrid::surf::StorageN11Model();
- all_existing_models->push_back(surf_storage_model);
+ surf_storage_model = new simgrid::kernel::resource::StorageN11Model();
}
namespace simgrid {
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
+
+StorageN11Model::StorageN11Model()
+{
+ all_existing_models.push_back(this);
+}
-StorageImpl* StorageN11Model::createStorage(
std::string id, std::string type_id, std::string content_name
,
-
std::string
attach)
+StorageImpl* StorageN11Model::createStorage(
const std::string& id, const std::string& type_id
,
+
const std::string& content_name, const std::string&
attach)
{
StorageType* storage_type = storage_types.at(type_id);
{
StorageType* storage_type = storage_types.at(type_id);
- double Bread =
surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(),
-
"property Bread, storage", type_id.c_str()
);
+ double Bread =
+
surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id
);
double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
- "property Bwrite, storage", type_id.c_str());
-
- StorageImpl* storage =
- new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach);
- storageCreatedCallbacks(storage);
+ "property Bwrite, storage", type_id);
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(),
Bread);
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(),
Bread);
- return storage;
+ return new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size,
+ attach);
}
double StorageN11Model::next_occuring_event(double now)
}
double StorageN11Model::next_occuring_event(double now)
@@
-77,17
+73,15
@@
double StorageN11Model::next_occuring_event(double now)
void StorageN11Model::update_actions_state(double /*now*/, double delta)
{
void StorageN11Model::update_actions_state(double /*now*/, double delta)
{
- for (auto it = std::begin(*get_
running_action_set()); it != std::end(*get_running
_action_set());) {
-
StorageAction& action = static_cast<StorageAction&>(*it)
;
+ for (auto it = std::begin(*get_
started_action_set()); it != std::end(*get_started
_action_set());) {
+
auto& action = *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));
++it; // increment iterator here since the following calls to action.finish() may invalidate it
action.update_remains(lrint(action.get_variable()->get_value() * delta));
+ 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_variable()->get_weight() > 0)) ||
- ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
- action.finish(kernel::resource::Action::State::done);
+ if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
+ ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+ action.finish(Action::State::FINISHED);
}
}
}
}
}
}
@@
-96,60
+90,65
@@
void StorageN11Model::update_actions_state(double /*now*/, double delta)
* Resource *
************/
* Resource *
************/
-StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::System* maxminSystem, double bread,
- double bwrite, std::string type_id, std::string content_name, sg_size_t size, std::string attach)
+StorageN11::StorageN11(StorageModel* model, const std::string& name, lmm::System* maxminSystem, double bread,
+ double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size,
+ const std::string& attach)
: StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
{
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
: StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
{
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
- simgrid::s4u::Storage::onCreation(this->piface_);
+ s4u::Storage::on_creation(this->piface_);
+}
+
+StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type)
+{
+ return new StorageN11Action(get_model(), size, not is_on(), this, type);
}
StorageAction* StorageN11::read(sg_size_t size)
{
}
StorageAction* StorageN11::read(sg_size_t size)
{
- return new StorageN11Action(
model(), size, isOff(), this,
READ);
+ return new StorageN11Action(
get_model(), size, not is_on(), this, s4u::Io::OpType::
READ);
}
StorageAction* StorageN11::write(sg_size_t size)
{
}
StorageAction* StorageN11::write(sg_size_t size)
{
- return new StorageN11Action(
model(), size, isOff(), this,
WRITE);
+ return new StorageN11Action(
get_model(), size, not is_on(), this, s4u::Io::OpType::
WRITE);
}
/**********
* Action *
**********/
}
/**********
* Action *
**********/
-StorageN11Action::StorageN11Action(kernel::resource::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, s4u::Io::OpType type)
: StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type)
{
: StorageAction(model, cost, failed, model->get_maxmin_system()->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_maxmin_system()->expand(storage->constraint(), get_variable(), 1.0);
+ model->get_maxmin_system()->expand(storage->
get_
constraint(), get_variable(), 1.0);
switch(type) {
switch(type) {
-
case
READ:
-
model->get_maxmin_system()->expand(storage->constraintR
ead_, get_variable(), 1.0);
- break;
-
case
WRITE:
-
model->get_maxmin_system()->expand(storage->constraintW
rite_, get_variable(), 1.0);
- break;
- default:
- THROW_UNIMPLEMENTED;
+
case s4u::Io::OpType::
READ:
+
model->get_maxmin_system()->expand(storage->constraint_r
ead_, get_variable(), 1.0);
+
break;
+
case s4u::Io::OpType::
WRITE:
+
model->get_maxmin_system()->expand(storage->constraint_w
rite_, get_variable(), 1.0);
+
break;
+
default:
+
THROW_UNIMPLEMENTED;
}
XBT_OUT();
}
void StorageN11Action::cancel()
{
}
XBT_OUT();
}
void StorageN11Action::cancel()
{
- set_state(Action::State::
failed
);
+ set_state(Action::State::
FAILED
);
}
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
}
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
- if (
suspended_ != Action::SuspendStates::sleeping
) {
- get_model()->get_maxmin_system()->update_variable_
weight
(get_variable(), 0.0);
- s
uspended_ = Action::SuspendStates::suspended
;
+ if (
is_running()
) {
+ get_model()->get_maxmin_system()->update_variable_
penalty
(get_variable(), 0.0);
+ s
et_suspend_state(Action::SuspendStates::SUSPENDED)
;
}
XBT_OUT();
}
}
XBT_OUT();
}
@@
-164,7
+163,7
@@
void StorageN11Action::set_max_duration(double /*duration*/)
THROW_UNIMPLEMENTED;
}
THROW_UNIMPLEMENTED;
}
-void StorageN11Action::set_
priority(double /*priority*/
)
+void StorageN11Action::set_
sharing_penalty(double
)
{
THROW_UNIMPLEMENTED;
}
{
THROW_UNIMPLEMENTED;
}
@@
-172,5
+171,6
@@
void StorageN11Action::update_remains_lazy(double /*now*/)
{
THROW_IMPOSSIBLE;
}
{
THROW_IMPOSSIBLE;
}
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid