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
On some systems, sqrt(int) is not defined properly. On others its just implemented...
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
82aa54a
..
1b4095a
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-6,6
+6,7
@@
#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/kernel/lmm/maxmin.hpp"
#include "src/surf/xml/platf.hpp"
#include "surf/surf.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/xml/platf.hpp"
#include "surf/surf.hpp"
@@
-20,12
+21,13
@@
extern std::map<std::string, simgrid::kernel::resource::StorageType*> storage_ty
void check_disk_attachment()
{
for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
void check_disk_attachment()
{
for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
- simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->get_impl()->getHost().c_str());
+ simgrid::kernel::routing::NetPoint* host_elm =
+ simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(s->get_impl()->getHost());
if (not host_elm)
surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
if (not host_elm)
surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
- s->get_impl()->getHost()
.c_str()
+ " does not exist.");
+ s->get_impl()->getHost() + " does not exist.");
else
else
- s->set_host(s
g_host_by_name(s->get_impl()->getHost().c_str
()));
+ s->set_host(s
imgrid::s4u::Host::by_name(s->get_impl()->getHost
()));
}
}
}
}
@@
-144,9
+146,9
@@
void StorageN11Action::cancel()
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
- if (
suspended_ != Action::SuspendStates::sleeping
) {
+ if (
is_running()
) {
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
- s
uspended_ = Action::SuspendStates::suspended
;
+ s
et_suspend_state(Action::SuspendStates::SUSPENDED)
;
}
XBT_OUT();
}
}
XBT_OUT();
}