+/* Copyright (c) 2013-2014. 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);
static int storage_selective_update = 0;
free(stype->content);
free(stype->content_type);
xbt_dict_free(&(stype->properties));
- 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 = dynamic_cast<StoragePtr>(static_cast<ResourcePtr>(r));
- xbt_dict_free(&storage->p_content);
- xbt_dynar_free(&storage->p_writeActions);
- free(storage->p_typeId);
- free(storage->p_contentType);
+ StoragePtr storage = static_cast<StoragePtr>(r);
// generic resource
delete storage;
}
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",
+ "\n\t\tproperties '%p''\n",
storage->id,
((storage_type_t) stype)->model,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- ((storage_type_t) stype)->properties);
+ storage->properties);
- surf_storage_model->createResource(storage->id,
+ surf_storage_model->createStorage(storage->id,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- storage->properties);
+ storage->properties,
+ storage->attach);
}
static void parse_mstorage_init(sg_platf_mstorage_cbarg_t /*mstorage*/)
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'",
}
StorageN11Model::StorageN11Model() : StorageModel() {
- StorageN11ActionLmm action;
+ 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));
-
+ xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
if (!p_maxminSystem) {
p_maxminSystem = lmm_system_new(storage_selective_update);
}
storage_running_action_set_that_does_not_need_being_checked = NULL;
}
-StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
- const char* content_name, const char* content_type, xbt_dict_t properties)
+StoragePtr StorageN11Model::createStorage(const char* id, const char* type_id,
+ const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach)
{
xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(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((char*)xbt_dict_get(storage_type->properties, "Bread"));
- double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bwrite"));
- double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bconnection"));
+ 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"));
- StoragePtr storage = new StorageN11Lmm(this, id, properties, p_maxminSystem,
+ StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem,
Bread, Bwrite, Bconnection,
- type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size);
+ type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size, (char *) attach);
- xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast<ResourcePtr>(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,
- storage_type->properties,
+ properties,
Bread);
if(!p_storageList)
unsigned int i, j;
StoragePtr storage;
void *_write_action;
- StorageActionLmmPtr write_action;
+ StorageActionPtr write_action;
- double min_completion = shareResourcesMaxMin(p_runningActionSet,
+ double min_completion = shareResourcesMaxMin(getRunningActionSet(),
p_maxminSystem, lmm_solve);
double rate;
// Foreach write action on disk
xbt_dynar_foreach(storage->p_writeActions, j, _write_action)
{
- write_action = dynamic_cast<StorageActionLmmPtr>(static_cast<ActionPtr>(_write_action));
- rate += lmm_variable_getvalue(write_action->p_variable);
+ 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);
void StorageN11Model::updateActionsState(double /*now*/, double delta)
{
- void *_action, *_next_action;
- StorageActionLmmPtr action = NULL;
+ StorageActionPtr action = NULL;
+
+ ActionListPtr actionSet = getRunningActionSet();
+ for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
+ ; it != itend ; it=itNext) {
+ ++itNext;
+ action = static_cast<StorageActionPtr>(&*it);
- xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) {
- action = dynamic_cast<StorageActionLmmPtr>(static_cast<ActionPtr>(_action));
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->p_variable);
- /* 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 - action->p_file->size); // disk usage
- action->p_file->size = incr; // file size
+ // Update the file size
+ // For each action of type write
+ 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 ;
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);
}
- double_update(&action->m_remains,
- lmm_variable_getvalue(action->p_variable) * delta);
+ action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->m_maxDuration != NO_MAX_DURATION)
- double_update(&action->m_maxDuration, delta);
+ if (action->getMaxDuration() != NO_MAX_DURATION)
+ action->updateMaxDuration(delta);
- if(action->m_remains > 0 &&
- lmm_get_variable_weight(action->p_variable) > 0 &&
+ if(action->getRemainsNoUpdate() > 0 &&
+ lmm_get_variable_weight(action->getVariable()) > 0 &&
action->p_storage->m_usedSize == action->p_storage->m_size)
{
- action->m_finish = surf_get_clock();
+ action->finish();
action->setState(SURF_ACTION_FAILED);
- } else if ((action->m_remains <= 0) &&
- (lmm_get_variable_weight(action->p_variable) > 0))
+ } else if ((action->getRemainsNoUpdate() <= 0) &&
+ (lmm_get_variable_weight(action->getVariable()) > 0))
{
- action->m_finish = surf_get_clock();
+ action->finish();
action->setState(SURF_ACTION_DONE);
- } else if ((action->m_maxDuration != NO_MAX_DURATION) &&
- (action->m_maxDuration <= 0))
+ } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
+ (action->getMaxDuration() <= 0))
{
- action->m_finish = surf_get_clock();
+ action->finish();
action->setState(SURF_ACTION_DONE);
}
}
-
return;
}
* Resource *
************/
-StorageN11Lmm::StorageN11Lmm(StorageModelPtr model, const char* name, xbt_dict_t properties,
+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)
- : Resource(model, name, properties),
- StorageLmm(maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size) {
+ 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);
-
- p_stateCurrent = SURF_RESOURCE_ON;
- m_usedSize = 0;
- m_size = 0;
-
- p_content = parseContent(content_name);
- p_contentType = content_type;
- p_constraint = lmm_constraint_new(maxminSystem, this, bconnection);
- p_constraintRead = lmm_constraint_new(maxminSystem, this, bread);
- p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite);
- m_size = size;
- p_typeId = xbt_strdup(type_id);
-}
-
-StorageActionPtr StorageN11Lmm::ls(const char* path)
-{
- StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != 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 StorageN11Lmm::open(const char* mount, const char* path)
+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);
+ psize = xbt_new(sg_size_t,1);
size = 0;
*psize = size;
xbt_dict_set(p_content, path, psize, NULL);
file->mount = xbt_strdup(mount);
file->current_position = 0;
- StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, OPEN);
+ StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN);
action->p_file = file;
+
return action;
}
-StorageActionPtr StorageN11Lmm::close(surf_file_t fd)
+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;
- StorageActionLmmPtr write_action;
+ StorageActionPtr write_action;
unsigned int i;
xbt_dynar_foreach(p_writeActions, i, _write_action) {
- write_action = dynamic_cast<StorageActionLmmPtr>(static_cast<ActionPtr>(_write_action));
+ write_action = static_cast<StorageActionPtr>(_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);
- StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, CLOSE);
+ StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE);
return action;
}
-StorageActionPtr StorageN11Lmm::read(surf_file_t fd, sg_size_t size)
+StorageActionPtr StorageN11::read(surf_file_t fd, sg_size_t size)
{
- if(size > fd->size){
- size = fd->size;
+ if(fd->current_position + size > fd->size){
+ size = fd->size - fd->current_position;
fd->current_position = fd->size;
}
else
- fd->current_position += size;
+ fd->current_position += size;
- StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, READ);
+ StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ);
return action;
}
-StorageActionPtr StorageN11Lmm::write(surf_file_t fd, sg_size_t size)
+StorageActionPtr 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);
- StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, WRITE);
+ 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
+ /* 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;
}
-void StorageN11Lmm::rename(const char *src, const char *dest)
-{
- 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);
-}
-
-xbt_dict_t StorageN11Lmm::getContent()
-{
- /* 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 StorageN11Lmm::getSize(){
- return m_size;
-}
-
/**********
* Action *
**********/
-StorageN11ActionLmm::StorageN11ActionLmm(ModelPtr model, double cost, bool failed, StorageLmmPtr storage, e_surf_action_storage_type_t type)
- : Action(model, cost, failed),
- StorageActionLmm(storage, type) {
- XBT_IN("(%s,%g", storage->m_name, cost);
- p_variable = lmm_variable_new(p_model->p_maxminSystem, this, 1.0, -1.0 , 3);
+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);
// Must be less than the max bandwidth for all actions
- lmm_expand(p_model->p_maxminSystem, storage->p_constraint, p_variable, 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0);
switch(type) {
case OPEN:
case CLOSE:
case STAT:
- case LS:
break;
case READ:
- lmm_expand(p_model->p_maxminSystem, storage->p_constraintRead,
- p_variable, 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->p_constraintRead,
+ getVariable(), 1.0);
break;
case WRITE:
- lmm_expand(p_model->p_maxminSystem, storage->p_constraintWrite,
- p_variable, 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
+ getVariable(), 1.0);
ActionPtr action = this;
xbt_dynar_push(storage->p_writeActions, &action);
ref();
XBT_OUT();
}
-int StorageN11ActionLmm::unref()
+int StorageN11Action::unref()
{
m_refcount--;
if (!m_refcount) {
- xbt_swag_remove(static_cast<ActionPtr>(this), p_stateSet);
- if (p_variable)
- lmm_variable_free(p_model->p_maxminSystem, p_variable);
+ if (actionHook::is_linked())
+ p_stateSet->erase(p_stateSet->iterator_to(*this));
+ if (getVariable())
+ lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
#ifdef HAVE_TRACING
- xbt_free(p_category);
+ xbt_free(getCategory());
#endif
delete this;
return 1;
return 0;
}
-void StorageN11ActionLmm::cancel()
+void StorageN11Action::cancel()
{
setState(SURF_ACTION_FAILED);
return;
}
-void StorageN11ActionLmm::suspend()
+void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
if (m_suspended != 2) {
- lmm_update_variable_weight(p_model->p_maxminSystem,
- p_variable,
+ lmm_update_variable_weight(getModel()->getMaxminSystem(),
+ getVariable(),
0.0);
m_suspended = 1;
}
XBT_OUT();
}
-void StorageN11ActionLmm::resume()
+void StorageN11Action::resume()
{
THROW_UNIMPLEMENTED;
}
-bool StorageN11ActionLmm::isSuspended()
+bool StorageN11Action::isSuspended()
{
return m_suspended == 1;
}
-void StorageN11ActionLmm::setMaxDuration(double /*duration*/)
+void StorageN11Action::setMaxDuration(double /*duration*/)
{
THROW_UNIMPLEMENTED;
}
-void StorageN11ActionLmm::setPriority(double /*priority*/)
+void StorageN11Action::setPriority(double /*priority*/)
{
THROW_UNIMPLEMENTED;
}