#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 = nullptr;
-
/*************
* CallBacks *
*************/
namespace surf {
StorageN11Model::StorageN11Model() : StorageModel() {
- Action *action = nullptr;
-
XBT_DEBUG("surf_storage_model_init_internal");
-
- storage_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(*action, stateHookup_));
- if (!maxminSystem_) {
- 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 = nullptr;
}
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
return storage;
}
-double StorageN11Model::next_occuring_event(double /*now*/)
+double StorageN11Model::nextOccuringEvent(double now)
{
- XBT_DEBUG("storage_share_resources");
+ double min_completion = StorageModel::nextOccuringEventFull(now);
- double min_completion = shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
-
- double rate;
- // Foreach disk
for(auto storage: p_storageList) {
- rate = 0;
- // Foreach write action on disk
- for (auto write_action: storage->p_writeActions) {
+ 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 = nullptr;
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
; it != itend ; it=itNext) {
++itNext;
- action = static_cast<StorageAction*>(&*it);
+
+ 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
- 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",
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_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->p_storage->usedSize_ == action->p_storage->size_) {
action->finish();
action->setState(Action::State::failed);
- } else if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) {
- action->finish();
- action->setState(Action::State::done);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0)) {
+ } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
}
}
- return;
}
/************
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, nullptr);
+ 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);
{
XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size);
// unref write actions from storage
- for (auto it = p_writeActions.cbegin(); it != p_writeActions.cend();) {
+ for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
StorageAction *write_action = *it;
if ((write_action->p_file) == fd) {
write_action->unref();
- it = p_writeActions.erase(it);
+ it = writeActions_.erase(it);
} else {
++it;
}
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);
+ usedSize_ -= (fd->size - fd->current_position);
// If the storage is full before even starting to write
- if(m_usedSize==m_size) {
+ 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;
void StorageN11Action::cancel()
{
setState(Action::State::failed);
- return;
}
void StorageN11Action::suspend()
