-/* Copyright (c) 2013-2014. 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 <cmath> /*ceil*/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
-static int storage_selective_update = 0;
-static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL;
-
/*************
* 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
- StoragePtr storage = static_cast<StoragePtr>(r);
- // generic resource
- delete storage;
-}
-
-static XBT_INLINE void routing_storage_host_free(void *r)
-{
- xbt_dynar_t dyn = (xbt_dynar_t) r;
- xbt_dynar_free(&dyn);
-}
-
-static void parse_storage_init(sg_platf_storage_cbarg_t storage)
-{
- void* stype = xbt_lib_get_or_null(storage_type_lib,
- storage->type_id,
- ROUTING_STORAGE_TYPE_LEVEL);
- if(!stype) xbt_die("No storage type '%s'",storage->type_id);
-
- // if storage content is not specified use the content of storage_type if exist
- if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
- storage->content = ((storage_type_t) stype)->content;
- storage->content_type = ((storage_type_t) stype)->content_type;
- XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ",
- storage->id,((storage_type_t) stype)->content_type,
- ((storage_type_t) stype)->type_id);
- }
-
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
- "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' "
- "\n\t\tproperties '%p''\n",
- storage->id,
- ((storage_type_t) stype)->model,
- ((storage_type_t) stype)->type_id,
- storage->content,
- storage->content_type,
- storage->properties);
-
- surf_storage_model->createResource(storage->id,
- ((storage_type_t) stype)->type_id,
- storage->content,
- storage->content_type,
- storage->properties);
-}
-
-static void parse_mstorage_init(sg_platf_mstorage_cbarg_t /*mstorage*/)
-{
- XBT_DEBUG("parse_mstorage_init");
-}
-
-static void parse_storage_type_init(sg_platf_storage_type_cbarg_t /*storagetype_*/)
-{
- XBT_DEBUG("parse_storage_type_init");
-}
-
-static void parse_mount_init(sg_platf_mount_cbarg_t /*mount*/)
-{
- XBT_DEBUG("parse_mount_init");
-}
-
-static void storage_parse_storage(sg_platf_storage_cbarg_t storage)
+static void check_disk_attachment()
{
- xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
- "Reading a storage, processing unit \"%s\" already exists", storage->id);
-
- // Verification of an existing type_id
-#ifndef NDEBUG
- void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
-#endif
- xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
-
- XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
- storage->id,
- storage->type_id,
- storage->content);
-
- xbt_lib_set(storage_lib,
- storage->id,
- ROUTING_STORAGE_LEVEL,
- (void *) xbt_strdup(storage->type_id));
-}
-
-static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type)
-{
- xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL),
- "Reading a storage type, processing unit \"%s\" already exists", storage_type->id);
-
- storage_type_t stype = xbt_new0(s_storage_type_t, 1);
- stype->model = xbt_strdup(storage_type->model);
- stype->properties = storage_type->properties;
- stype->content = xbt_strdup(storage_type->content);
- stype->content_type = xbt_strdup(storage_type->content_type);
- stype->type_id = xbt_strdup(storage_type->id);
- stype->size = storage_type->size;
- stype->model_properties = storage_type->model_properties;
-
- XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', "
- "content '%s', and content_type '%s'",
- stype->type_id,
- stype->model,
- storage_type->content,
- storage_type->content_type);
-
- xbt_lib_set(storage_type_lib,
- stype->type_id,
- ROUTING_STORAGE_TYPE_LEVEL,
- (void *) stype);
-}
-
-static void storage_parse_mstorage(sg_platf_mstorage_cbarg_t /*mstorage*/)
-{
- THROW_UNIMPLEMENTED;
-// mount_t mnt = xbt_new0(s_mount_t, 1);
-// mnt->id = xbt_strdup(mstorage->type_id);
-// mnt->name = xbt_strdup(mstorage->name);
-//
-// if(!mount_list){
-// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id);
-// mount_list = xbt_dynar_new(sizeof(char *), NULL);
-// }
-// xbt_dynar_push(mount_list,(void *) mnt);
-// free(mnt->id);
-// free(mnt->name);
-// xbt_free(mnt);
-// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id);
-}
-
-static void mount_free(void *p)
-{
- mount_t mnt = (mount_t) p;
- xbt_free(mnt->name);
-}
-
-static void storage_parse_mount(sg_platf_mount_cbarg_t mount)
-{
- // Verification of an existing storage
-#ifndef NDEBUG
- void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL);
-#endif
- xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId);
-
- XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name);
-
- s_mount_t mnt;
- mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId));
- mnt.name = xbt_strdup(mount->name);
-
- if(!mount_list){
- XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id);
- mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free);
+ for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) {
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str());
+ if (not host_elm)
+ surf_parse_error(std::string("Unable to attach storage ") + s.second->cname() + ": host " + s.second->getHost() +
+ " does not exist.");
+ else
+ s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str());
}
- xbt_dynar_push(mount_list, &mnt);
}
-static void storage_define_callbacks()
+void storage_register_callbacks()
{
- sg_platf_storage_add_cb(parse_storage_init);
- sg_platf_storage_type_add_cb(parse_storage_type_init);
- sg_platf_mstorage_add_cb(parse_mstorage_init);
- sg_platf_mount_add_cb(parse_mount_init);
-}
-
-void storage_register_callbacks() {
-
- ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
- 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);
-
- sg_platf_storage_add_cb(storage_parse_storage);
- sg_platf_mstorage_add_cb(storage_parse_mstorage);
- sg_platf_storage_type_add_cb(storage_parse_storage_type);
- sg_platf_mount_add_cb(storage_parse_mount);
+ 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 StorageN11Model();
- storage_define_callbacks();
- xbt_dynar_push(model_list, &surf_storage_model);
-}
-
-StorageN11Model::StorageN11Model() : StorageModel() {
- ActionPtr 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);
- }
+ surf_storage_model = new simgrid::surf::StorageN11Model();
+ all_existing_models->push_back(surf_storage_model);
}
-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;
-}
+namespace simgrid {
+namespace surf {
-StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
- const char* content_name, const char* content_type, xbt_dict_t properties)
+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"));
+ StorageImpl* storage =
+ new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, content_name, storage_type->size, attach);
+ storageCreatedCallbacks(storage);
- StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem,
- Bread, Bwrite, Bconnection,
- type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size);
+ 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);
- xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast<ResourcePtr>(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);
+ p_storageList.push_back(storage);
return storage;
}
-double StorageN11Model::shareResources(double now)
+double StorageN11Model::nextOccuringEvent(double now)
{
- XBT_DEBUG("storage_share_resources %f", now);
- unsigned int i, j;
- StoragePtr storage;
- void *_write_action;
- StorageActionPtr 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<StorageActionPtr>(_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::nextOccuringEventFull(now);
}
void StorageN11Model::updateActionsState(double /*now*/, double delta)
{
- StorageActionPtr action = NULL;
-
- ActionListPtr actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
+ ActionList *actionSet = getRunningActionSet();
+ for (ActionList::iterator it(actionSet->begin()), itNext = it, itend(actionSet->end()); it != itend; it = itNext) {
++itNext;
- action = static_cast<StorageActionPtr>(&*it);
- if(action->m_type == WRITE)
- {
- // Update the disk usage
- // Update the file size
- // For each action of type write
- double rate = lmm_variable_getvalue(action->getVariable());
- /* Hack to avoid rounding differences between x86 and x86_64
- * (note that the next sizes are of type sg_size_t). */
- long incr = delta * rate + MAXMIN_PRECISION;
- action->p_storage->m_usedSize += incr; // disk usage
- action->p_file->size += incr; // file size
-
- 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);
+ StorageAction *action = static_cast<StorageAction*>(&*it);
+
+ double current_progress = lrint(lmm_variable_getvalue(action->getVariable()) * delta);
+
+ action->updateRemains(current_progress);
+ if (action->type_ == WRITE) {
+ action->storage_->usedSize_ += current_progress;
+ action->file_->incrPosition(current_progress);
+ action->file_->setSize(action->file_->tell());
- if (action->getMaxDuration() != NO_MAX_DURATION)
+ action->storage_->getContent()->erase(action->file_->cname());
+ action->storage_->getContent()->insert({action->file_->cname(), action->file_->size()});
+ }
+
+ 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))
- {
+ if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 &&
+ action->storage_->usedSize_ == action->storage_->getSize()) {
action->finish();
- action->setState(SURF_ACTION_DONE);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
- (action->getMaxDuration() <= 0))
- {
+ action->setState(Action::State::failed);
+ } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
- action->setState(SURF_ACTION_DONE);
+ action->setState(Action::State::done);
}
}
- return;
}
/************
* Resource *
************/
-StorageN11::StorageN11(StorageModelPtr 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)
- : Storage(model, name, properties,
- maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size) {
- XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
-}
-
-StorageActionPtr StorageN11::ls(const char* path)
-{
- StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, LS);
-
- action->p_lsDict = NULL;
- xbt_dict_t ls_dict = xbt_dict_new_homogeneous(xbt_free);
-
- char* key;
- sg_size_t size = 0;
- xbt_dict_cursor_t cursor = NULL;
-
- xbt_dynar_t dyn = NULL;
- char* file = NULL;
-
- // for each file in the storage content
- xbt_dict_foreach(p_content,cursor,key,size){
- // Search if file start with the prefix 'path'
- if(xbt_str_start_with(key,path)){
- file = &key[strlen(path)];
-
- // Split file with '/'
- dyn = xbt_str_split(file,"/");
- file = xbt_dynar_get_as(dyn,0,char*);
-
- // file
- if(xbt_dynar_length(dyn) == 1){
- sg_size_t *psize = xbt_new(sg_size_t, 1);
- *psize=size;
- xbt_dict_set(ls_dict, file, psize, NULL);
- }
- // Directory
- else
- {
- // if directory does not exist yet in the dictionary
- if(!xbt_dict_get_or_null(ls_dict,file))
- xbt_dict_set(ls_dict,file,NULL,NULL);
- }
- xbt_dynar_free(&dyn);
- }
- }
-
- action->p_lsDict = ls_dict;
- return action;
-}
-
-StorageActionPtr StorageN11::open(const char* mount, const char* path)
-{
- 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;
-
- StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN);
- action->p_file = file;
- return action;
-}
-
-StorageActionPtr StorageN11::close(surf_file_t fd)
-{
- char *filename = fd->name;
- XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size);
- // unref write actions from storage
- void *_write_action;
- StorageActionPtr write_action;
- unsigned int i;
- xbt_dynar_foreach(p_writeActions, i, _write_action) {
- write_action = static_cast<StorageActionPtr>(static_cast<ActionPtr>(_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);
- StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE);
- return action;
-}
-
-StorageActionPtr StorageN11::read(surf_file_t fd, sg_size_t size)
-{
- if(size > fd->size){
- size = fd->size;
- fd->current_position = fd->size;
- }
- else
- fd->current_position += size;
-
- StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ);
- return action;
-}
-
-StorageActionPtr StorageN11::write(surf_file_t fd, sg_size_t size)
+StorageN11::StorageN11(StorageModel* model, std::string name, lmm_system_t 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)
{
- char *filename = fd->name;
- XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size);
-
- StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE);
- action->p_file = fd;
- fd->current_position += size;
- // If the storage is full
- if(m_usedSize==m_size) {
- action->setState(SURF_ACTION_FAILED);
- }
- return action;
+ XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
+ simgrid::s4u::Storage::onCreation(this->piface_);
}
-void StorageN11::rename(const char *src, const char *dest)
+StorageAction* StorageN11::read(sg_size_t size)
{
- sg_size_t *psize, *new_psize;
- psize = (sg_size_t*) xbt_dict_get_or_null(p_content,src);
- new_psize = xbt_new(sg_size_t, 1);
- *new_psize = *psize;
- if (psize){// src file exists
- xbt_dict_remove(p_content, src);
- xbt_dict_set(p_content, dest, new_psize,NULL);
- XBT_DEBUG("Change file name from %s to %s, size '%llu'",src, dest, *psize);
- }
- else
- XBT_DEBUG("File %s doesn't exist",src);
+ return new StorageN11Action(model(), size, isOff(), this, READ);
}
-xbt_dict_t StorageN11::getContent()
+StorageAction* StorageN11::write(sg_size_t size)
{
- /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
- /*surf_action_t action = storage_action_execute(storage,0, LS);*/
-
- xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
- xbt_dict_cursor_t cursor = NULL;
- char *file;
- sg_size_t *psize;
-
- xbt_dict_foreach(p_content, cursor, file, psize){
- xbt_dict_set(content_dict,file,psize,NULL);
- }
- return content_dict;
-}
-
-sg_size_t StorageN11::getSize(){
- return m_size;
+ return new StorageN11Action(model(), size, isOff(), this, WRITE);
}
/**********
* Action *
**********/
-StorageN11Action::StorageN11Action(ModelPtr model, double cost, bool failed, StoragePtr 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(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
- lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0);
switch(type) {
- case OPEN:
- case CLOSE:
- case STAT:
- case LS:
- break;
case READ:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintRead,
- getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0);
break;
case WRITE:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
- getVariable(), 1.0);
- ActionPtr action = this;
- xbt_dynar_push(storage->p_writeActions, &action);
- ref();
+ lmm_expand(model->getMaxminSystem(), storage->constraintWrite_, getVariable(), 1.0);
break;
+ default:
+ THROW_UNIMPLEMENTED;
}
XBT_OUT();
}
int StorageN11Action::unref()
{
- m_refcount--;
- if (!m_refcount) {
- if (actionHook::is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ refcount_--;
+ if (not refcount_) {
+ if (action_hook.is_linked())
+ stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
-#ifdef HAVE_TRACING
xbt_free(getCategory());
-#endif
delete this;
return 1;
}
void StorageN11Action::cancel()
{
- setState(SURF_ACTION_FAILED);
- return;
+ setState(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_ != 2) {
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
+ suspended_ = 1;
}
XBT_OUT();
}
bool StorageN11Action::isSuspended()
{
- return m_suspended == 1;
+ return suspended_ == 1;
}
void StorageN11Action::setMaxDuration(double /*duration*/)
THROW_UNIMPLEMENTED;
}
-void StorageN11Action::setPriority(double /*priority*/)
+void StorageN11Action::setSharingWeight(double /*priority*/)
{
THROW_UNIMPLEMENTED;
}
+}
+}