#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 "xbt/utility.hpp"
-#include <cmath> /*ceil*/
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
*************/
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()) {
+ 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->getImpl()->getHost().c_str());
if (not host_elm)
surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
}
}
-void storage_register_callbacks()
-{
- simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
- instr_routing_define_callbacks();
-}
-
/*********
* Model *
*********/
StorageAction* StorageN11::read(sg_size_t size)
{
- return new StorageN11Action(model(), size, isOff(), this, READ);
+ return new StorageN11Action(get_model(), size, is_off(), this, READ);
}
StorageAction* StorageN11::write(sg_size_t size)
{
- return new StorageN11Action(model(), size, isOff(), this, WRITE);
+ return new StorageN11Action(get_model(), size, is_off(), this, WRITE);
}
/**********
XBT_IN("(%s,%g", storage->get_cname(), cost);
// 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) {
case READ:
model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);