X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..fd9d52c0c7a9c96221fff2013cdeef05b6e979e2:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 9609e6b36e..3b270eb2b7 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -16,7 +16,7 @@ static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = * 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); @@ -28,7 +28,7 @@ static XBT_INLINE void routing_storage_type_free(void *r) 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(r); @@ -36,7 +36,7 @@ static XBT_INLINE void surf_storage_resource_free(void *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); @@ -69,9 +69,9 @@ StorageN11Model::StorageN11Model() : StorageModel() { 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); } } @@ -80,24 +80,28 @@ StorageN11Model::~StorageN11Model(){ 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) { 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 Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread")); - double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite")); - double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection")); + double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread"), + "property Bread, storage",type_id); + double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite"), + "property Bwrite, storage",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); @@ -114,7 +118,7 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id, return storage; } -double StorageN11Model::shareResources(double /*now*/) +double StorageN11Model::next_occuring_event(double /*now*/) { XBT_DEBUG("storage_share_resources"); unsigned int i, j; @@ -123,7 +127,7 @@ double StorageN11Model::shareResources(double /*now*/) StorageAction *write_action; double min_completion = shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); + maxminSystem_, lmm_solve); double rate; // Foreach disk @@ -149,7 +153,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) - ; it != itend ; it=itNext) { + ; it != itend ; it=itNext) { ++itNext; action = static_cast(&*it); @@ -163,15 +167,15 @@ 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->p_file->name, - action->progress, current_progress, incr, - lrint(action->progress + current_progress), - lrint(action->progress)+ incr); + "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) + lrint(action->progress)+ incr) incr++; action->progress +=current_progress; @@ -197,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->getMaxDuration() <= 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } } return; @@ -220,9 +224,9 @@ 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) - : Storage(model, name, properties, - maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, 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); } @@ -263,7 +267,7 @@ StorageAction *StorageN11::close(surf_file_t fd) StorageAction *write_action; unsigned int i; xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = static_cast(_write_action); + write_action = static_cast(_write_action); if ((write_action->p_file) == fd) { xbt_dynar_cursor_rm(p_writeActions, &i); write_action->unref(); @@ -305,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; } @@ -315,9 +319,9 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) **********/ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type) - : StorageAction(model, cost, failed, - lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), - storage, type) { +: StorageAction(model, cost, failed, + lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), + storage, type) { XBT_IN("(%s,%g", storage->getName(), cost); // Must be less than the max bandwidth for all actions @@ -329,16 +333,16 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora break; case READ: lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, - getVariable(), 1.0); + getVariable(), 1.0); break; case WRITE: lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite, - getVariable(), 1.0); + 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); -// ref(); + //TODO there is something annoying with what's below. Have to sort it out... + // Action *action = this; + // xbt_dynar_push(storage->p_writeActions, &action); + // ref(); break; } XBT_OUT(); @@ -346,10 +350,10 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora int StorageN11Action::unref() { - m_refcount--; - if (!m_refcount) { - if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + refcount_--; + if (!refcount_) { + if (action_hook.is_linked()) + stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); xbt_free(getCategory()); @@ -361,18 +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) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), - getVariable(), - 0.0); - m_suspended = 1; + if (suspended_ != 2) { + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); + suspended_ = 1; } XBT_OUT(); } @@ -384,7 +386,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } void StorageN11Action::setMaxDuration(double /*duration*/)