#include <math.h> /*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 *
*************/
-static XBT_INLINE void routing_storage_type_free(void *r)
+static inline void routing_storage_type_free(void *r)
{
storage_type_t stype = (storage_type_t) r;
free(stype->model);
free(stype);
}
-static XBT_INLINE void surf_storage_resource_free(void *r)
+static inline void surf_storage_resource_free(void *r)
{
// specific to storage
simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(r);
delete storage;
}
-static XBT_INLINE void routing_storage_host_free(void *r)
+static inline void routing_storage_host_free(void *r)
{
xbt_dynar_t dyn = (xbt_dynar_t) r;
xbt_dynar_free(&dyn);
* 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);
- }
+ maxminSystem_ = lmm_system_new(false /*lazy?*/);
}
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;
}
+#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)
+ 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 '%s' declared several times in the platform file",
- 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 Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"),
"property Bconnection, storage",type_id);
- Storage *storage = new StorageN11(this, id, properties, p_maxminSystem,
+ Storage *storage = new StorageN11(this, id, properties, maxminSystem_,
Bread, Bwrite, Bconnection, type_id, (char *)content_name,
- xbt_strdup(content_type), storage_type->size, (char *) attach);
+ 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);
+ 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::next_occuring_event(double /*now*/)
+double StorageN11Model::nextOccuringEvent(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);
+ double min_completion = StorageModel::nextOccuringEventFull(now);
+
+ for(auto storage: p_storageList) {
+ double rate = 0;
+ // Foreach write action on that disk
+ for (auto write_action: storage->writeActions_) {
rate += lmm_variable_getvalue(write_action->getVariable());
}
if(rate > 0)
- min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate);
+ min_completion = MIN(min_completion, (storage->size_-storage->usedSize_)/rate);
}
return min_completion;
void StorageN11Model::updateActionsState(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)
- {
+ StorageAction *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());
+ 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",
+ 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)
+ 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_storage->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);
+ xbt_dict_t content_dict = action->p_storage->content_;
+ xbt_dict_set(content_dict, action->p_file->name, psize, nullptr);
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->getMaxDuration() != NO_MAX_DURATION)
+ 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->p_storage->usedSize_ == action->p_storage->size_) {
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;
}
/************
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)
+ 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) {
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(p_content, path);
+ psize = (sg_size_t*) xbt_dict_get_or_null(content_, path);
// if file does not exist create an empty file
if(psize)
size = *psize;
psize = xbt_new(sg_size_t,1);
size = 0;
*psize = size;
- xbt_dict_set(p_content, path, psize, NULL);
+ xbt_dict_set(content_, path, psize, nullptr);
XBT_DEBUG("File '%s' was not found, file created.",path);
}
surf_file_t file = xbt_new0(s_surf_file_t,1);
StorageAction *StorageN11::close(surf_file_t fd)
{
- char *filename = fd->name;
- XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size);
+ XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, 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);
+ for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
+ StorageAction *write_action = *it;
if ((write_action->p_file) == fd) {
- xbt_dynar_cursor_rm(p_writeActions, &i);
write_action->unref();
+ it = writeActions_.erase(it);
+ } else {
+ ++it;
}
}
free(fd->name);
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);
+ /* 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
- if(m_usedSize==m_size) {
- action->setState(SURF_ACTION_FAILED);
+ if(usedSize_==size_) {
+ action->setState(Action::State::failed);
}
return action;
}
case STAT:
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);
+ lmm_expand(model->getMaxminSystem(), storage->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);
+ // storage->p_writeActions->push_back(action);
// ref();
break;
}
int StorageN11Action::unref()
{
- m_refcount--;
- if (!m_refcount) {
+ refcount_--;
+ if (!refcount_) {
if (action_hook.is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
xbt_free(getCategory());
void StorageN11Action::cancel()
{
- setState(SURF_ACTION_FAILED);
- return;
+ setState(Action::State::failed);
}
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
+ if (suspended_ != 2) {
lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
- m_suspended = 1;
+ suspended_ = 1;
}
XBT_OUT();
}
bool StorageN11Action::isSuspended()
{
- return m_suspended == 1;
+ return suspended_ == 1;
}
void StorageN11Action::setMaxDuration(double /*duration*/)
