* Model *
*********/
-StorageModel::StorageModel()
- : Model()
+StorageModel::StorageModel(): Model()
{
- p_storageList = nullptr;
}
StorageModel::~StorageModel(){
lmm_system_free(maxminSystem_);
surf_storage_model = nullptr;
- xbt_dynar_free(&p_storageList);
}
/************
, p_contentType(xbt_strdup(content_type))
, m_size(size), m_usedSize(0)
, p_typeId(xbt_strdup(type_id))
- , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr))
+ , p_writeActions(std::vector<StorageAction*>())
{
p_content = parseContent(content_name);
turnOn();
, p_contentType(xbt_strdup(content_type))
, m_size(size), m_usedSize(0)
, p_typeId(xbt_strdup(type_id))
- , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr))
+ , p_writeActions(std::vector<StorageAction*>())
{
p_content = parseContent(content_name);
p_attach = xbt_strdup(attach);
Storage::~Storage(){
storageDestructedCallbacks(this);
xbt_dict_free(&p_content);
- xbt_dynar_free(&p_writeActions);
free(p_typeId);
free(p_contentType);
free(p_attach);
* @param attach [description]
* @return The created Storage
*/
- virtual Storage *createStorage(const char* id,
- const char* type_id,
- const char* content_name,
- const char* content_type,
- xbt_dict_t properties,
- const char *attach) = 0;
+ virtual Storage *createStorage(const char* id, const char* type_id,
+ const char* content_name, const char* content_type,
+ xbt_dict_t properties, const char *attach) = 0;
bool next_occuring_event_isIdempotent() {return true;}
- xbt_dynar_t p_storageList;
+ std::vector<Storage*> p_storageList;
};
/************
xbt_dict_t parseContent(const char *filename);
- xbt_dynar_t p_writeActions;
+ std::vector<StorageAction*> p_writeActions;
lmm_constraint_t p_constraintWrite; /* Constraint for maximum write bandwidth*/
lmm_constraint_t p_constraintRead; /* Constraint for maximum write bandwidth*/
sg_size_t current_position;
} s_surf_file_t;
-
#endif /* STORAGE_INTERFACE_HPP_ */
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 *),nullptr);
- xbt_dynar_push(p_storageList, &storage);
+ p_storageList.push_back(storage);
return storage;
}
double StorageN11Model::next_occuring_event(double /*now*/)
{
XBT_DEBUG("storage_share_resources");
- unsigned int i, j;
- Storage *storage;
- void *_write_action;
- StorageAction *write_action;
double min_completion = shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
double rate;
// Foreach disk
- xbt_dynar_foreach(p_storageList,i,storage) {
+ for(auto storage: p_storageList) {
rate = 0;
// Foreach write action on disk
- xbt_dynar_foreach(storage->p_writeActions, j, _write_action) {
- write_action = static_cast<StorageAction*>(_write_action);
+ for (auto write_action: storage->p_writeActions) {
rate += lmm_variable_getvalue(write_action->getVariable());
}
if(rate > 0)
++itNext;
action = static_cast<StorageAction*>(&*it);
- if(action->m_type == WRITE)
- {
+ if(action->m_type == WRITE){
// Update the disk usage
// Update the file size
// For each action of type write
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 (auto it = p_writeActions.cbegin(); it != p_writeActions.cend();) {
+ StorageAction *write_action = *it;
if ((write_action->p_file) == fd) {
- xbt_dynar_cursor_rm(p_writeActions, &i);
write_action->unref();
+ it = p_writeActions.erase(it);
+ } else {
+ ++it;
}
}
free(fd->name);
case STAT:
break;
case READ:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintRead,
- getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, getVariable(), 1.0);
break;
case WRITE:
- lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
- getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->p_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;
}