-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. 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 <math.h> /*ceil*/
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
+#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*/
-static int storage_selective_update = 0;
-static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL;
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
* CallBacks *
*************/
+extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-static XBT_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 XBT_INLINE void surf_storage_resource_free(void *r)
-{
- // specific to storage
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(r);
- // generic resource
- delete storage;
-}
-
-static XBT_INLINE void routing_storage_host_free(void *r)
+static void check_disk_attachment()
{
- xbt_dynar_t dyn = (xbt_dynar_t) r;
- xbt_dynar_free(&dyn);
+ for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
+ 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->getCname() + ": host " +
+ s->getImpl()->getHost().c_str() + " does not exist.");
+ else
+ s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
+ }
}
void storage_register_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);
+ simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
+ instr_routing_define_callbacks();
}
/*********
* Model *
*********/
-void surf_storage_model_init_default(void)
+void surf_storage_model_init_default()
{
surf_storage_model = new simgrid::surf::StorageN11Model();
- xbt_dynar_push(all_existing_models, &surf_storage_model);
+ all_existing_models->push_back(surf_storage_model);
}
namespace simgrid {
namespace surf {
-StorageN11Model::StorageN11Model() : StorageModel() {
- Action *action = NULL;
-
- XBT_DEBUG("surf_storage_model_init_internal");
-
- storage_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
- if (!p_maxminSystem) {
- p_maxminSystem = lmm_system_new(storage_selective_update);
- }
-}
-
-StorageN11Model::~StorageN11Model(){
- xbt_swag_free(storage_running_action_set_that_does_not_need_being_checked);
- storage_running_action_set_that_does_not_need_being_checked = NULL;
-}
-
-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)
+StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name,
+ std::string attach)
{
+ StorageType* storage_type = storage_types.at(type_id);
- 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);
+ double Bread = surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(),
+ "property Bread, storage", type_id.c_str());
+ double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
+ "property Bwrite, storage", type_id.c_str());
- double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread"));
- double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite"));
- double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"));
-
- Storage *storage = new StorageN11(this, id, properties, p_maxminSystem,
- Bread, Bwrite, Bconnection, type_id, (char *)content_name,
- xbt_strdup(content_type), storage_type->size, (char *) attach);
+ StorageImpl* storage =
+ new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, 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);
- if(!p_storageList)
- p_storageList = xbt_dynar_new(sizeof(char *),NULL);
- xbt_dynar_push(p_storageList, &storage);
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
+ Bread);
return storage;
}
-double StorageN11Model::shareResources(double /*now*/)
+double StorageN11Model::next_occuring_event(double now)
{
- XBT_DEBUG("storage_share_resources");
- unsigned int i, j;
- Storage *storage;
- void *_write_action;
- StorageAction *write_action;
-
- double min_completion = shareResourcesMaxMin(getRunningActionSet(),
- p_maxminSystem, lmm_solve);
-
- double rate;
- // Foreach disk
- xbt_dynar_foreach(p_storageList,i,storage)
- {
- rate = 0;
- // Foreach write action on disk
- xbt_dynar_foreach(storage->p_writeActions, j, _write_action)
- {
- write_action = static_cast<StorageAction*>(_write_action);
- rate += lmm_variable_getvalue(write_action->getVariable());
- }
- if(rate > 0)
- min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate);
- }
-
- return min_completion;
+ return StorageModel::next_occuring_event_full(now);
}
-void StorageN11Model::updateActionsState(double /*now*/, double delta)
+void StorageN11Model::update_actions_state(double /*now*/, double delta)
{
- StorageAction *action = NULL;
-
- ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
- ++itNext;
- action = static_cast<StorageAction*>(&*it);
-
- if(action->m_type == WRITE)
- {
- // Update the disk usage
- // Update the file size
- // For each action of type write
- volatile double current_progress =
- delta * lmm_variable_getvalue(action->getVariable());
- 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);
-
- /* take care of rounding error accumulation */
- if (lrint(action->progress + current_progress) >
- lrint(action->progress)+ incr)
- incr++;
-
- action->progress +=current_progress;
-
- action->p_storage->m_usedSize += incr; // disk usage
- action->p_file->current_position+= incr; // current_position
- // which becomes the new file size
- action->p_file->size = action->p_file->current_position ;
+ for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+ StorageAction& action = static_cast<StorageAction&>(*it);
+ ++it; // increment iterator here since the following calls to action.finish() may invalidate it
+ action.update_remains(lrint(action.get_variable()->get_value() * delta));
- sg_size_t *psize = xbt_new(sg_size_t,1);
- *psize = action->p_file->size;
- xbt_dict_t content_dict = action->p_storage->p_content;
- xbt_dict_set(content_dict, action->p_file->name, psize, NULL);
- }
-
- action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
+ if (action.get_max_duration() > NO_MAX_DURATION)
+ action.update_max_duration(delta);
- if (action->getMaxDuration() != NO_MAX_DURATION)
- action->updateMaxDuration(delta);
-
- if(action->getRemainsNoUpdate() > 0 &&
- lmm_get_variable_weight(action->getVariable()) > 0 &&
- action->p_storage->m_usedSize == action->p_storage->m_size)
- {
- action->finish();
- action->setState(SURF_ACTION_FAILED);
- } else if ((action->getRemainsNoUpdate() <= 0) &&
- (lmm_get_variable_weight(action->getVariable()) > 0))
- {
- action->finish();
- action->setState(SURF_ACTION_DONE);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
- (action->getMaxDuration() <= 0))
- {
- action->finish();
- action->setState(SURF_ACTION_DONE);
+ if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
+ ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+ action.finish(kernel::resource::Action::State::done);
}
}
- return;
}
/************
* 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,
- 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) {
- XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
-}
-
-StorageAction *StorageN11::open(const char* mount, const char* path)
+StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::System* maxminSystem, double bread,
+ double bwrite, std::string type_id, std::string content_name, sg_size_t size, std::string attach)
+ : StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
{
- XBT_DEBUG("\tOpen file '%s'",path);
-
- sg_size_t size, *psize;
- psize = (sg_size_t*) xbt_dict_get_or_null(p_content, path);
- // if file does not exist create an empty file
- if(psize)
- size = *psize;
- else {
- psize = xbt_new(sg_size_t,1);
- size = 0;
- *psize = size;
- xbt_dict_set(p_content, path, psize, NULL);
- 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;
-
- StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN);
- action->p_file = file;
-
- return action;
+ XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
+ simgrid::s4u::Storage::onCreation(this->piface_);
}
-StorageAction *StorageN11::close(surf_file_t fd)
+StorageAction* StorageN11::read(sg_size_t size)
{
- char *filename = fd->name;
- XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size);
- // unref write actions from storage
- void *_write_action;
- StorageAction *write_action;
- unsigned int i;
- xbt_dynar_foreach(p_writeActions, i, _write_action) {
- write_action = static_cast<StorageAction*>(_write_action);
- if ((write_action->p_file) == fd) {
- xbt_dynar_cursor_rm(p_writeActions, &i);
- write_action->unref();
- }
- }
- free(fd->name);
- free(fd->mount);
- xbt_free(fd);
- StorageAction *action = new StorageN11Action(getModel(), 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){
- size = 0;
- } else {
- size = fd->size - fd->current_position;
- }
- fd->current_position = fd->size;
- }
- else
- fd->current_position += size;
-
- StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ);
- return action;
+ return new StorageN11Action(model(), size, isOff(), this, READ);
}
-StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size)
+StorageAction* StorageN11::write(sg_size_t size)
{
- 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;
- /* Substract the part of the file that might disappear from the used sized on
- * the storage element */
- m_usedSize -= (fd->size - fd->current_position);
- // If the storage is full before even starting to write
- if(m_usedSize==m_size) {
- action->setState(SURF_ACTION_FAILED);
- }
- return action;
+ return new StorageN11Action(model(), size, isOff(), this, WRITE);
}
/**********
* 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) {
- XBT_IN("(%s,%g", storage->getName(), cost);
+StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
+ e_surf_action_storage_type_t type)
+ : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type)
+{
+ XBT_IN("(%s,%g", storage->getCname(), cost);
// Must be less than the max bandwidth for all actions
- lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0);
+ model->get_maxmin_system()->expand(storage->constraint(), get_variable(), 1.0);
switch(type) {
- case OPEN:
- case CLOSE:
- case STAT:
- break;
case READ:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintRead,
- getVariable(), 1.0);
+ model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);
break;
case WRITE:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
- getVariable(), 1.0);
-
-//TODO there is something annoying with what's below. Have to sort it out...
-// Action *action = this;
-// xbt_dynar_push(storage->p_writeActions, &action);
-// ref();
+ model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0);
break;
+ default:
+ THROW_UNIMPLEMENTED;
}
XBT_OUT();
}
-int StorageN11Action::unref()
-{
- m_refcount--;
- if (!m_refcount) {
- if (action_hook.is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
- if (getVariable())
- lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
- xbt_free(getCategory());
- delete this;
- return 1;
- }
- return 0;
-}
-
void StorageN11Action::cancel()
{
- setState(SURF_ACTION_FAILED);
- return;
+ set_state(Action::State::failed);
}
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
- lmm_update_variable_weight(getModel()->getMaxminSystem(),
- getVariable(),
- 0.0);
- m_suspended = 1;
+ if (suspended_ != Action::SuspendStates::sleeping) {
+ get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
+ suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();
}
THROW_UNIMPLEMENTED;
}
-bool StorageN11Action::isSuspended()
+void StorageN11Action::set_max_duration(double /*duration*/)
{
- return m_suspended == 1;
+ THROW_UNIMPLEMENTED;
}
-void StorageN11Action::setMaxDuration(double /*duration*/)
+void StorageN11Action::set_priority(double /*priority*/)
{
THROW_UNIMPLEMENTED;
}
-
-void StorageN11Action::setPriority(double /*priority*/)
+void StorageN11Action::update_remains_lazy(double /*now*/)
{
- THROW_UNIMPLEMENTED;
+ THROW_IMPOSSIBLE;
}
-
}
}