* under the terms of the license (GNU LGPL) which comes with this package. */
#include "storage_n11.hpp"
+#include "simgrid/s4u/engine.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "surf_private.h"
#include <math.h> /*ceil*/
if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
simgrid::surf::Storage* storage =
static_cast<simgrid::surf::Storage*>(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
- simgrid::kernel::routing::NetPoint* host_elm = sg_netcard_by_name_or_null(storage->attach_);
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(storage->attach_);
if (!host_elm)
- surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->getName(), storage->attach_);
+ surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->cname(), storage->attach_);
}
}
}
void storage_register_callbacks()
{
- simgrid::surf::on_postparse.connect(check_disk_attachment);
+ simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
instr_routing_define_callbacks();
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
file->mount = xbt_strdup(mount);
file->current_position = 0;
- StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN);
+ StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN);
action->file_ = file;
return action;
free(fd->name);
free(fd->mount);
xbt_free(fd);
- StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, CLOSE);
+ StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, CLOSE);
return action;
}
else
fd->current_position += size;
- StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ);
+ StorageAction* action = new StorageN11Action(model(), size, isOff(), this, READ);
return action;
}
char *filename = fd->name;
XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size);
- StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE);
+ StorageAction* action = new StorageN11Action(model(), size, isOff(), this, WRITE);
action->file_ = fd;
/* Substract the part of the file that might disappear from the used sized on the storage element */
usedSize_ -= (fd->size - fd->current_position);
: StorageAction(model, cost, failed,
lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3),
storage, type) {
- XBT_IN("(%s,%g", storage->getName(), cost);
+ XBT_IN("(%s,%g", storage->cname(), cost);
// Must be less than the max bandwidth for all actions
- lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0);
switch(type) {
case OPEN:
case CLOSE: