-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. 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"
-#include "surf_private.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include <math.h> /*ceil*/
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
* CallBacks *
*************/
+extern std::map<std::string, storage_type_t> storage_types;
-static inline void routing_storage_type_free(void *r)
-{
- storage_type_t stype = (storage_type_t) r;
- free(stype->model);
- free(stype->type_id);
- free(stype->content);
- free(stype->content_type);
- xbt_dict_free(&(stype->properties));
- xbt_dict_free(&(stype->model_properties));
- free(stype);
-}
-
-static inline void surf_storage_resource_free(void *r)
+static void check_disk_attachment()
{
- // specific to storage
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(r);
- // generic resource
- delete storage;
-}
-
-static inline void routing_storage_host_free(void *r)
-{
- xbt_dynar_t dyn = (xbt_dynar_t) r;
- xbt_dynar_free(&dyn);
+ 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_);
+ }
+ }
}
void storage_register_callbacks()
{
+ simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
+ instr_routing_define_callbacks();
+
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
- ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free);
- ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) {
+ delete static_cast<simgrid::surf::Storage*>(self);
+ });
}
/*********
namespace simgrid {
namespace surf {
-StorageN11Model::StorageN11Model() : StorageModel() {
- XBT_DEBUG("surf_storage_model_init_internal");
- maxminSystem_ = lmm_system_new(false /*lazy?*/);
-}
-
-StorageN11Model::~StorageN11Model(){
-}
-
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
- const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach)
+Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
+ const char* content_type, 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_type_t) xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
+ storage_type_t storage_type = storage_types.at(type_id);
- double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread"),
- "property Bread, storage",type_id);
- double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite"),
- "property Bwrite, storage",type_id);
- double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"),
- "property Bconnection, storage",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, properties, maxminSystem_,
- Bread, Bwrite, Bconnection, type_id, (char *)content_name,
- content_type, storage_type->size, (char *) attach);
+ Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name,
+ content_type, 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\tproperties '%p'\n\t\tBread '%f'\n",
- id, type_id, properties, Bread);
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread);
p_storageList.push_back(storage);
StorageAction *action = static_cast<StorageAction*>(&*it);
- if(action->m_type == WRITE){
+ if (action->type_ == WRITE) {
// Update the disk usage
// Update the file size
// For each action of type write
long int incr = current_progress;
XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld",
- action->p_file->name,
- action->progress, current_progress, incr,
- lrint(action->progress + current_progress),
- lrint(action->progress)+ incr);
+ action->file_->name, action->progress_, current_progress, incr,
+ lrint(action->progress_ + current_progress), lrint(action->progress_) + incr);
/* take care of rounding error accumulation */
- if (lrint(action->progress + current_progress) > lrint(action->progress)+ incr)
+ if (lrint(action->progress_ + current_progress) > lrint(action->progress_) + incr)
incr++;
- action->progress +=current_progress;
+ action->progress_ += current_progress;
- action->p_storage->usedSize_ += incr; // disk usage
- action->p_file->current_position+= incr; // current_position
+ action->storage_->usedSize_ += incr; // disk usage
+ action->file_->current_position += incr; // current_position
// which becomes the new file size
- action->p_file->size = action->p_file->current_position ;
-
- sg_size_t *psize = xbt_new(sg_size_t,1);
- *psize = action->p_file->size;
- xbt_dict_t content_dict = action->p_storage->content_;
- xbt_dict_set(content_dict, action->p_file->name, psize, nullptr);
+ 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->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
if (action->getMaxDuration() > NO_MAX_DURATION)
action->updateMaxDuration(delta);
- if(action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 &&
- action->p_storage->usedSize_ == action->p_storage->size_) {
+ if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 &&
+ action->storage_->usedSize_ == action->storage_->size_) {
action->finish();
action->setState(Action::State::failed);
} else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
* Resource *
************/
-StorageN11::StorageN11(StorageModel *model, const char* name,
- xbt_dict_t properties, 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, properties,
- maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) {
+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)
+{
XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
}
{
XBT_DEBUG("\tOpen file '%s'",path);
- sg_size_t size, *psize;
- psize = (sg_size_t*) xbt_dict_get_or_null(content_, path);
+ sg_size_t size;
+ sg_size_t* psize = nullptr;
// if file does not exist create an empty file
- if(psize)
- size = *psize;
+ if (content_->find(path) != content_->end())
+ size = *(content_->at(path));
else {
- psize = xbt_new(sg_size_t,1);
- size = 0;
+ psize = new sg_size_t;
+ size = 0;
*psize = size;
- xbt_dict_set(content_, path, psize, nullptr);
+ content_->insert({path, psize});
XBT_DEBUG("File '%s' was not found, file created.",path);
}
surf_file_t file = xbt_new0(s_surf_file_t,1);
file->mount = xbt_strdup(mount);
file->current_position = 0;
- StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN);
- action->p_file = file;
+ StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN);
+ action->file_ = file;
return action;
}
// unref write actions from storage
for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
StorageAction *write_action = *it;
- if ((write_action->p_file) == fd) {
+ if ((write_action->file_) == fd) {
write_action->unref();
it = writeActions_.erase(it);
} else {
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);
- action->p_file = fd;
+ 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);
// If the storage is full before even starting to write
: 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:
// storage->p_writeActions->push_back(action);
// ref();
break;
+ default:
+ THROW_UNIMPLEMENTED;
}
XBT_OUT();
}