double StorageN11Model::nextOccuringEvent(double now)
{
- 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->size_-storage->usedSize_)/rate);
- }
-
- return min_completion;
+ return StorageModel::nextOccuringEventFull(now);
}
void StorageN11Model::updateActionsState(double /*now*/, double delta)
long int incr = current_progress;
XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld",
- action->file_->name, action->progress_, current_progress, incr,
+ action->file_->cname(), action->progress_, current_progress, incr,
lrint(action->progress_ + current_progress), lrint(action->progress_) + incr);
/* take care of rounding error accumulation */
action->progress_ += current_progress;
action->storage_->usedSize_ += incr; // disk usage
- action->file_->current_position += incr; // current_position
+ action->file_->incrPosition(incr); // current_position
// which becomes the new file size
- action->file_->size = action->file_->current_position;
+ action->file_->setSize(action->file_->tell());
- action->storage_->content_->erase(action->file_->name);
- action->storage_->content_->insert({action->file_->name, action->file_->size});
+ action->storage_->content_->erase(action->file_->cname());
+ action->storage_->content_->insert({action->file_->cname(), action->file_->size()});
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
content_->insert({path, size});
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;
+ FileImpl* file = new FileImpl(path, mount, size);
StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN);
action->file_ = file;
StorageAction *StorageN11::close(surf_file_t fd)
{
- XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size);
- // unref write actions from storage
- for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
- StorageAction *write_action = *it;
- if ((write_action->file_) == fd) {
- write_action->unref();
- it = writeActions_.erase(it);
- } else {
- ++it;
- }
- }
- free(fd->name);
- free(fd->mount);
- xbt_free(fd);
+ XBT_DEBUG("\tClose file '%s' size '%llu'", fd->cname(), fd->size());
StorageAction* action = new StorageN11Action(model(), 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){
+ if (fd->tell() + size > fd->size()) {
+ if (fd->tell() > fd->size()) {
size = 0;
} else {
- size = fd->size - fd->current_position;
+ size = fd->size() - fd->tell();
}
- fd->current_position = fd->size;
+ fd->setPosition(fd->size());
}
else
- fd->current_position += size;
+ fd->incrPosition(size);
StorageAction* action = new StorageN11Action(model(), size, isOff(), this, READ);
return action;
StorageAction *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);
+ XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'", fd->cname(), size, fd->size());
StorageAction* action = new StorageN11Action(model(), size, isOff(), this, WRITE);
action->file_ = fd;
/* Substract the part of the file that might disappear from the used sized on the storage element */
- usedSize_ -= (fd->size - fd->current_position);
+ usedSize_ -= (fd->size() - fd->tell());
// If the storage is full before even starting to write
if(usedSize_==size_) {
action->setState(Action::State::failed);
break;
case WRITE:
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;
- // storage->p_writeActions->push_back(action);
- // ref();
break;
default:
THROW_UNIMPLEMENTED;
THROW_UNIMPLEMENTED;
}
-void StorageN11Action::setPriority(double /*priority*/)
+void StorageN11Action::setSharingWeight(double /*priority*/)
{
THROW_UNIMPLEMENTED;
}