static void check_disk_attachment()
{
- xbt_lib_cursor_t cursor;
- char* key;
- void** data;
- xbt_lib_foreach(storage_lib, cursor, key, data) {
- 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_netpoint_by_name_or_null(storage->attach_);
- if (!host_elm)
- surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->cname(), storage->attach_);
- }
+ for (auto s : *simgrid::surf::StorageImpl::storagesMap()) {
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->attach_.c_str());
+ if (not host_elm)
+ surf_parse_error("Unable to attach storage %s: host %s does not exist.", s.second->cname(),
+ s.second->attach_.c_str());
+ else
+ s.second->piface_.attached_to_ = sg_host_by_name(s.second->attach_.c_str());
}
}
{
simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
instr_routing_define_callbacks();
-
- ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) {
- delete static_cast<simgrid::surf::Storage*>(self);
- });
}
/*********
namespace simgrid {
namespace surf {
-Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
- const char* content_type, const char* attach)
+StorageImpl* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
+ const char* attach)
{
-
- xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
- "Storage '%s' declared several times in the platform file", id);
-
storage_type_t 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);
double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
"property Bwrite, storage", type_id);
- double Bconnection = surf_parse_get_bandwidth(storage_type->model_properties->at("Bconnection").c_str(),
- "property Bconnection, storage", type_id);
- Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name,
- content_type, storage_type->size, (char*)attach);
+ StorageImpl* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, (char*)content_name,
+ storage_type->size, (char*)attach);
storageCreatedCallbacks(storage);
- xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread);
long int incr = current_progress;
XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld",
- action->file_->name, action->progress_, current_progress, incr,
+ action->file_->cname(), action->progress_, current_progress, incr,
lrint(action->progress_ + current_progress), lrint(action->progress_) + incr);
/* take care of rounding error accumulation */
action->progress_ += current_progress;
action->storage_->usedSize_ += incr; // disk usage
- action->file_->current_position += incr; // current_position
+ action->file_->incrPosition(incr); // current_position
// which becomes the new file size
- action->file_->size = action->file_->current_position;
-
- sg_size_t* psize = new sg_size_t;
- *psize = action->file_->size;
- std::map<std::string, sg_size_t*>* content_dict = action->storage_->content_;
- auto entry = content_dict->find(action->file_->name);
- delete entry->second;
- entry->second = psize;
+ action->file_->setSize(action->file_->tell());
+
+ action->storage_->content_->erase(action->file_->cname());
+ action->storage_->content_->insert({action->file_->cname(), action->file_->size()});
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
************/
StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
- double bconnection, const char* type_id, char* content_name, const char* content_type,
- sg_size_t size, char* attach)
- : Storage(model, name, maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach)
+ const char* type_id, char* content_name, sg_size_t size, char* attach)
+ : StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
{
- XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
+ XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
+ simgrid::s4u::Storage::onCreation(this->piface_);
}
StorageAction *StorageN11::open(const char* mount, const char* path)
XBT_DEBUG("\tOpen file '%s'",path);
sg_size_t size;
- sg_size_t* psize = nullptr;
// if file does not exist create an empty file
if (content_->find(path) != content_->end())
- size = *(content_->at(path));
+ size = content_->at(path);
else {
- psize = new sg_size_t;
- size = 0;
- *psize = size;
- content_->insert({path, psize});
+ size = 0;
+ content_->insert({path, size});
XBT_DEBUG("File '%s' was not found, file created.",path);
}
- surf_file_t file = xbt_new0(s_surf_file_t,1);
- file->name = xbt_strdup(path);
- file->size = size;
- file->mount = xbt_strdup(mount);
- file->current_position = 0;
+ FileImpl* file = new FileImpl(path, mount, size);
StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN);
action->file_ = file;
StorageAction *StorageN11::close(surf_file_t fd)
{
- XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size);
+ XBT_DEBUG("\tClose file '%s' size '%llu'", fd->cname(), fd->size());
// unref write actions from storage
for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
StorageAction *write_action = *it;
++it;
}
}
- free(fd->name);
- free(fd->mount);
- xbt_free(fd);
StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, CLOSE);
return action;
}
StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size)
{
- if(fd->current_position + size > fd->size){
- if (fd->current_position > fd->size){
+ if (fd->tell() + size > fd->size()) {
+ if (fd->tell() > fd->size()) {
size = 0;
} else {
- size = fd->size - fd->current_position;
+ size = fd->size() - fd->tell();
}
- fd->current_position = fd->size;
+ fd->setPosition(fd->size());
}
else
- fd->current_position += size;
+ fd->incrPosition(size);
StorageAction* action = new StorageN11Action(model(), size, isOff(), this, READ);
return action;
StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size)
{
- char *filename = fd->name;
- XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size);
+ XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'", fd->cname(), size, fd->size());
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);
+ usedSize_ -= (fd->size() - fd->tell());
// If the storage is full before even starting to write
if(usedSize_==size_) {
action->setState(Action::State::failed);
* Action *
**********/
-StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type)
-: StorageAction(model, cost, failed,
- lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3),
- storage, type) {
+StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage,
+ e_surf_action_storage_type_t type)
+ : StorageAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0, 3), storage, type)
+{
XBT_IN("(%s,%g", storage->cname(), cost);
// Must be less than the max bandwidth for all actions
int StorageN11Action::unref()
{
refcount_--;
- if (!refcount_) {
+ if (not refcount_) {
if (action_hook.is_linked())
stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
THROW_UNIMPLEMENTED;
}
-void StorageN11Action::setPriority(double /*priority*/)
+void StorageN11Action::setSharingWeight(double /*priority*/)
{
THROW_UNIMPLEMENTED;
}