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
make NetZoneImpl public too
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
71ee41d
..
d242419
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-1,11
+1,14
@@
-/* Copyright (c) 2013-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
8
. 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. */
#include "storage_n11.hpp"
/* 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. */
#include "storage_n11.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/lmm/maxmin.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);
@@
-17,13
+20,13
@@
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
static void check_disk_attachment()
{
static void check_disk_attachment()
{
- for (auto const& s :
*simgrid::surf::StorageImpl::storagesMap
()) {
- simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s
.second
->getHost().c_str());
+ 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)
if (not host_elm)
- surf_parse_error(std::string("Unable to attach storage ") + s
.second
->getCname() + ": host " +
- s
.second->getHost
() + " does not exist.");
+ surf_parse_error(std::string("Unable to attach storage ") + s->getCname() + ": host " +
+ s
->getImpl()->getHost().c_str
() + " does not exist.");
else
else
- s
.second->piface_.attached_to_ = sg_host_by_name(s.second
->getHost().c_str());
+ s
->attached_to_ = sg_host_by_name(s->getImpl()
->getHost().c_str());
}
}
}
}
@@
-63,8
+66,6
@@
StorageImpl* StorageN11Model::createStorage(std::string id, std::string 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);
- p_storageList.push_back(storage);
-
return storage;
}
return storage;
}
@@
-78,14
+79,14
@@
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.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) {
- action.finish(Action::State::done);
+ action.finish(
kernel::resource::
Action::State::done);
}
}
}
}
}
}
@@
-116,20
+117,20
@@
StorageAction* StorageN11::write(sg_size_t size)
* Action *
**********/
* Action *
**********/
-StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage,
+StorageN11Action::StorageN11Action(
kernel::resource::
Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
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;
@@
-141,10
+142,10
@@
int StorageN11Action::unref()
{
refcount_--;
if (not refcount_) {
{
refcount_--;
if (not refcount_) {
- if (
action_hook
.is_linked())
- s
tateSet_->erase(stateSet_->iterator_to(*this)
);
+ if (
stateSetHook_
.is_linked())
+ 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;
@@
-160,9
+161,9
@@
void StorageN11Action::cancel()
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
- if (suspended_ !=
2
) {
-
lmm_update_variable_weight(getModel()->getMaxminSystem(),
getVariable(), 0.0);
- suspended_ =
1
;
+ if (suspended_ !=
Action::SuspendStates::sleeping
) {
+
getModel()->getMaxminSystem()->update_variable_weight(
getVariable(), 0.0);
+ suspended_ =
Action::SuspendStates::suspended
;
}
XBT_OUT();
}
}
XBT_OUT();
}
@@
-174,7
+175,7
@@
void StorageN11Action::resume()
bool StorageN11Action::isSuspended()
{
bool StorageN11Action::isSuspended()
{
- return suspended_ ==
1
;
+ return suspended_ ==
Action::SuspendStates::suspended
;
}
void StorageN11Action::setMaxDuration(double /*duration*/)
}
void StorageN11Action::setMaxDuration(double /*duration*/)