X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa3dc3e610404e0933c91ee3239a0550cd0294f4..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 91cd1bd321..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,74 +28,26 @@ 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 - Storage *storage = static_cast(r); + simgrid::surf::Storage *storage = static_cast(r); // generic resource 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); } -static void storage_parse_mstorage(sg_platf_mstorage_cbarg_t /*mstorage*/) +void storage_register_callbacks() { - THROW_UNIMPLEMENTED; -// mount_t mnt = xbt_new0(s_mount_t, 1); -// mnt->id = xbt_strdup(mstorage->type_id); -// mnt->name = xbt_strdup(mstorage->name); -// -// if(!mount_list){ -// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); -// mount_list = xbt_dynar_new(sizeof(char *), NULL); -// } -// xbt_dynar_push(mount_list,(void *) mnt); -// free(mnt->id); -// free(mnt->name); -// xbt_free(mnt); -// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); -} - -static void mount_free(void *p) -{ - mount_t mnt = (mount_t) p; - xbt_free(mnt->name); -} - -static void storage_parse_mount(sg_platf_mount_cbarg_t mount) -{ - // Verification of an existing storage -#ifndef NDEBUG - void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL); -#endif - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId); - - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); - - s_mount_t mnt; - mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); - mnt.name = xbt_strdup(mount->name); - - if(!mount_list){ - XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); - } - xbt_dynar_push(mount_list, &mnt); -} - -void storage_register_callbacks() { - ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f); ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free); ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free); - - sg_platf_mstorage_add_cb(storage_parse_mstorage); - sg_platf_mount_add_cb(storage_parse_mount); } /********* @@ -104,19 +56,22 @@ void storage_register_callbacks() { void surf_storage_model_init_default(void) { - surf_storage_model = new StorageN11Model(); + surf_storage_model = new simgrid::surf::StorageN11Model(); xbt_dynar_push(all_existing_models, &surf_storage_model); } +namespace simgrid { +namespace surf { + StorageN11Model::StorageN11Model() : StorageModel() { Action *action = NULL; 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); } } @@ -125,25 +80,29 @@ 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); - surf_callback_emit(storageCreatedCallbacks, storage); + content_type, storage_type->size, (char *) attach); + storageCreatedCallbacks(storage); 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", @@ -159,16 +118,16 @@ 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 %f", now); + XBT_DEBUG("storage_share_resources"); unsigned int i, j; Storage *storage; void *_write_action; StorageAction *write_action; double min_completion = shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); + maxminSystem_, lmm_solve); double rate; // Foreach disk @@ -194,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); @@ -208,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; @@ -242,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; @@ -265,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); } @@ -293,7 +252,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN); action->p_file = file; return action; @@ -308,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(); @@ -317,7 +276,7 @@ StorageAction *StorageN11::close(surf_file_t fd) free(fd->name); free(fd->mount); xbt_free(fd); - StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, CLOSE); return action; } @@ -334,7 +293,7 @@ StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size) else fd->current_position += size; - StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ); + StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ); return action; } @@ -343,14 +302,14 @@ 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); - StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE); + 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); // 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; } @@ -360,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 @@ -374,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(); @@ -391,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()); @@ -406,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(); } @@ -429,7 +386,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } void StorageN11Action::setMaxDuration(double /*duration*/) @@ -442,3 +399,5 @@ void StorageN11Action::setPriority(double /*priority*/) THROW_UNIMPLEMENTED; } +} +}