X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc676704bebcd57e5ea98bb43154245a150948f..c987f60dfea775b1675a01e76f05bd723aa3e992:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 5eaa3ace9c..20668ded2c 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -10,7 +10,7 @@ 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; +static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = nullptr; /************* * CallBacks * @@ -64,20 +64,20 @@ namespace simgrid { namespace surf { StorageN11Model::StorageN11Model() : StorageModel() { - Action *action = NULL; + 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, p_stateHookup)); - if (!p_maxminSystem) { - p_maxminSystem = lmm_system_new(storage_selective_update); + xbt_swag_new(xbt_swag_offset(*action, stateHookup_)); + if (!maxminSystem_) { + maxminSystem_ = lmm_system_new(storage_selective_update); } } 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; + 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 @@ -99,9 +99,9 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id, 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); @@ -112,7 +112,7 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id, Bread); if(!p_storageList) - p_storageList = xbt_dynar_new(sizeof(char *),NULL); + p_storageList = xbt_dynar_new(sizeof(char *),nullptr); xbt_dynar_push(p_storageList, &storage); return storage; @@ -127,7 +127,7 @@ double StorageN11Model::next_occuring_event(double /*now*/) StorageAction *write_action; double min_completion = shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); + maxminSystem_, lmm_solve); double rate; // Foreach disk @@ -149,7 +149,7 @@ double StorageN11Model::next_occuring_event(double /*now*/) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - StorageAction *action = NULL; + StorageAction *action = nullptr; ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) @@ -162,7 +162,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) // Update the disk usage // Update the file size // For each action of type write - volatile double current_progress = + double current_progress = delta * lmm_variable_getvalue(action->getVariable()); long int incr = current_progress; @@ -188,7 +188,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) 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_set(content_dict, action->p_file->name, psize, nullptr); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -201,17 +201,17 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) action->p_storage->m_usedSize == action->p_storage->m_size) { action->finish(); - action->setState(SURF_ACTION_FAILED); + action->setState(Action::State::failed); } else if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } else if ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } } return; @@ -224,7 +224,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) 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); @@ -243,7 +243,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) psize = xbt_new(sg_size_t,1); size = 0; *psize = size; - xbt_dict_set(p_content, path, psize, NULL); + xbt_dict_set(p_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); @@ -309,7 +309,7 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) 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); + action->setState(Action::State::failed); } return action; } @@ -350,10 +350,10 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora 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()); @@ -365,16 +365,16 @@ int StorageN11Action::unref() void StorageN11Action::cancel() { - setState(SURF_ACTION_FAILED); + setState(Action::State::failed); return; } 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(); } @@ -386,7 +386,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } void StorageN11Action::setMaxDuration(double /*duration*/)