X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4493d506bea568ad5f4a4bb96bab54bd9966bf29..f3677661714bf6122d678071c0bd44141417be14:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 624b6cbdcf..56454da3db 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2004-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "surf_private.h" #include "surf_interface.hpp" #include "network_interface.hpp" @@ -84,6 +90,15 @@ xbt_dynar_t surf_path = NULL; xbt_dynar_t host_that_restart = NULL; xbt_dict_t watched_hosts_lib; +surf_callback(void, void) surfExitCallbacks; + +s_surf_model_description_t surf_plugin_description[] = { + {"Energy", + "Cpu energy consumption.", + sg_energy_plugin_init}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; + /* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { {"LV08", @@ -141,7 +156,7 @@ s_surf_model_description_t surf_workstation_model_description[] = { s_surf_model_description_t surf_vm_workstation_model_description[] = { {"default", - "Default vm workstation model.)", + "Default vm workstation model.", surf_vm_workstation_model_init_current_default}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -245,7 +260,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { "Y:\\", "Z:\\" }; -#endif +#endif /* * Returns the initial path. On Windows the initial path is @@ -319,7 +334,9 @@ int find_model_description(s_surf_model_description_t * table, if (!strcmp(name, table[i].name)) { return i; } - name_list = strdup(table[0].name); + if (!table[0].name) + xbt_die("No model is valid! This is a bug."); + name_list = xbt_strdup(table[0].name); for (i = 1; table[i].name; i++) { name_list = (char *) xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 3); strcat(name_list, ", "); @@ -342,17 +359,22 @@ static XBT_INLINE void routing_asr_prop_free(void *p) static XBT_INLINE void surf_cpu_free(void *r) { - delete dynamic_cast(static_cast(r)); + delete static_cast(r); } static XBT_INLINE void surf_link_free(void *r) { - delete dynamic_cast(static_cast(r)); + delete static_cast(r); } static XBT_INLINE void surf_workstation_free(void *r) { - delete dynamic_cast(static_cast(r)); + delete static_cast(r); +} + +static XBT_INLINE void surf_storage_free(void *r) +{ + delete static_cast(r); } @@ -370,6 +392,7 @@ void surf_init(int *argc, char **argv) as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); storage_type_lib = xbt_lib_new(); + file_lib = xbt_lib_new(); watched_hosts_lib = xbt_dict_new_homogeneous(NULL); XBT_DEBUG("Add routing levels"); @@ -381,6 +404,7 @@ void surf_init(int *argc, char **argv) SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free); SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_workstation_free); SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_link_free); + SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); if (!model_list) @@ -413,12 +437,25 @@ void surf_exit(void) sg_config_finalize(); + xbt_dynar_free(&host_that_restart); + xbt_dynar_free(&surf_path); + + xbt_lib_free(&host_lib); + xbt_lib_free(&link_lib); + xbt_lib_free(&as_router_lib); + xbt_lib_free(&storage_lib); + xbt_lib_free(&storage_type_lib); + xbt_lib_free(&file_lib); + xbt_dict_free(&watched_hosts_lib); + xbt_dynar_foreach(model_list, iter, model) delete model; xbt_dynar_free(&model_list); xbt_dynar_free(&model_list_invoke); routing_exit(); + surf_callback_emit(surfExitCallbacks); + if (maxmin_system) { lmm_system_free(maxmin_system); maxmin_system = NULL; @@ -435,37 +472,25 @@ void surf_exit(void) xbt_free(surf_mins); surf_mins = NULL; - xbt_dynar_free(&host_that_restart); - xbt_dynar_free(&surf_path); - - xbt_lib_free(&host_lib); - xbt_lib_free(&link_lib); - xbt_lib_free(&as_router_lib); - xbt_lib_free(&storage_lib); - xbt_lib_free(&storage_type_lib); - - xbt_dict_free(&watched_hosts_lib); - tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } + /********* * Model * *********/ Model::Model(const char *name) - : p_maxminSystem(0), p_name(name), - m_resOnCB(0), m_resOffCB(0), - m_actCancelCB(0), m_actSuspendCB(0), m_actResumeCB(0) + : p_maxminSystem(NULL) + , p_name(name) { - ActionPtr action = NULL; - p_readyActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); - p_runningActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); - p_failedActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); - p_doneActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_readyActionSet = new ActionList(); + p_runningActionSet = new ActionList(); + p_failedActionSet = new ActionList(); + p_doneActionSet = new ActionList(); p_modifiedSet = NULL; p_actionHeap = NULL; @@ -474,10 +499,10 @@ Model::Model(const char *name) } Model::~Model(){ -xbt_swag_free(p_readyActionSet); -xbt_swag_free(p_runningActionSet); -xbt_swag_free(p_failedActionSet); -xbt_swag_free(p_doneActionSet); + delete p_readyActionSet; + delete p_runningActionSet; + delete p_failedActionSet; + delete p_doneActionSet; } double Model::shareResources(double now) @@ -493,21 +518,23 @@ double Model::shareResources(double now) double Model::shareResourcesLazy(double now) { - ActionLmmPtr action = NULL; + ActionPtr action = NULL; double min = -1; double value; XBT_DEBUG - ("Before share resources, the size of modified actions set is %d", - xbt_swag_size(p_modifiedSet)); + ("Before share resources, the size of modified actions set is %zd", + p_modifiedSet->size()); lmm_solve(p_maxminSystem); XBT_DEBUG - ("After share resources, The size of modified actions set is %d", - xbt_swag_size(p_modifiedSet)); + ("After share resources, The size of modified actions set is %zd", + p_modifiedSet->size()); - while((action = static_cast(xbt_swag_extract(p_modifiedSet)))) { + while(!p_modifiedSet->empty()) { + action = &(p_modifiedSet->front()); + p_modifiedSet->pop_front(); int max_dur_flag = 0; if (action->getStateSet() != p_runningActionSet) @@ -523,7 +550,7 @@ double Model::shareResourcesLazy(double now) value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { if (action->getRemains() > 0) { - value = action->getRemains() / value; + value = action->getRemainsNoUpdate() / value; min = now + value; } else { value = 0.0; @@ -540,14 +567,14 @@ double Model::shareResourcesLazy(double now) max_dur_flag = 1; } - XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, + XBT_DEBUG("Action(%p) Start %f Finish %f Max_duration %f", action, action->getStartTime(), now + value, action->getMaxDuration()); if (min != -1) { action->heapRemove(p_actionHeap); action->heapInsert(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); - XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, + XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now); } else DIE_IMPOSSIBLE; } @@ -558,7 +585,7 @@ double Model::shareResourcesLazy(double now) else min = -1; - XBT_DEBUG("The minimum with the HEAP %lf", min); + XBT_DEBUG("The minimum with the HEAP %f", min); return min; } @@ -567,31 +594,30 @@ double Model::shareResourcesFull(double /*now*/) { THROW_UNIMPLEMENTED; } - -double Model::shareResourcesMaxMin(xbt_swag_t running_actions, +double Model::shareResourcesMaxMin(ActionListPtr running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { - void *_action = NULL; - ActionLmmPtr action = NULL; + ActionPtr action = NULL; double min = -1; double value = -1; solve(sys); - xbt_swag_foreach(_action, running_actions) { - action = dynamic_cast(static_cast(_action)); + ActionList::iterator it(running_actions->begin()), itend(running_actions->end()); + for(; it != itend ; ++it) { + action = &*it; value = lmm_variable_getvalue(action->getVariable()); if ((value > 0) || (action->getMaxDuration() >= 0)) break; } - if (!_action) + if (!action) return -1.0; if (value > 0) { if (action->getRemains() > 0) - min = action->getRemains() / value; + min = action->getRemainsNoUpdate() / value; else min = 0.0; if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) @@ -600,14 +626,12 @@ double Model::shareResourcesMaxMin(xbt_swag_t running_actions, min = action->getMaxDuration(); - for (_action = xbt_swag_getNext(static_cast(action), running_actions->offset); - _action; - _action = xbt_swag_getNext(static_cast(action), running_actions->offset)) { - action = dynamic_cast(static_cast(_action)); + for (++it; it != itend; ++it) { + action = &*it; value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { if (action->getRemains() > 0) - value = action->getRemains() / value; + value = action->getRemainsNoUpdate() / value; else value = 0.0; if (value < min) { @@ -637,66 +661,12 @@ void Model::updateActionsState(double now, double delta) void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) { - } void Model::updateActionsStateFull(double /*now*/, double /*delta*/) { - } - -void Model::addTurnedOnCallback(ResourceCallback rc) -{ - m_resOnCB = rc; -} - -void Model::notifyResourceTurnedOn(ResourcePtr r) -{ - m_resOnCB(r); -} - -void Model::addTurnedOffCallback(ResourceCallback rc) -{ - m_resOffCB = rc; -} - -void Model::notifyResourceTurnedOff(ResourcePtr r) -{ - m_resOffCB(r); -} - -void Model::addActionCancelCallback(ActionCallback ac) -{ - m_actCancelCB = ac; -} - -void Model::notifyActionCancel(ActionPtr a) -{ - m_actCancelCB(a); -} - -void Model::addActionResumeCallback(ActionCallback ac) -{ - m_actResumeCB = ac; -} - -void Model::notifyActionResume(ActionPtr a) -{ - m_actResumeCB(a); -} - -void Model::addActionSuspendCallback(ActionCallback ac) -{ - m_actSuspendCB = ac; -} - -void Model::notifyActionSuspend(ActionPtr a) -{ - m_actSuspendCB(a); -} - - /************ * Resource * ************/ @@ -705,16 +675,26 @@ Resource::Resource() : p_name(NULL), p_properties(NULL), p_model(NULL) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(stateInit) +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint) {} +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(stateInit) +{} + +Resource::~Resource() { + xbt_free((void*)p_name); + xbt_dict_free(&p_properties); +} + e_surf_resource_state_t Resource::getState() { return m_stateCurrent; @@ -734,7 +714,6 @@ void Resource::turnOn() { if (!m_running) { m_running = true; - getModel()->notifyResourceTurnedOn(this); } } @@ -742,17 +721,26 @@ void Resource::turnOff() { if (m_running) { m_running = false; - getModel()->notifyResourceTurnedOff(this); } } -ResourceLmm::ResourceLmm() - : p_constraint(NULL) -{} +ModelPtr Resource::getModel() { + return p_model; +} -ResourceLmm::ResourceLmm(lmm_constraint_t constraint) - : p_constraint(constraint) -{} +const char *Resource::getName() { + return p_name; +} + +xbt_dict_t Resource::getProperties() { + if (p_properties==NULL) + p_properties = xbt_dict_new(); + return p_properties; +} + +lmm_constraint_t Resource::getConstraint() { + return p_constraint; +} /********** * Action * @@ -773,14 +761,48 @@ Action::Action() Action::Action(ModelPtr model, double cost, bool failed) : m_priority(1.0) - , m_failed(failed) - , m_start(surf_get_clock()), m_finish(-1.0) + , m_refcount(1) , m_remains(cost) , m_maxDuration(NO_MAX_DURATION) + , m_finish(-1.0) + , m_failed(failed) + , m_start(surf_get_clock()) , m_cost(cost) - , p_data(NULL) , p_model(model) + , p_data(NULL) + , p_variable(NULL) + , m_lastValue(0) + , m_lastUpdate(0) + , m_suspended(false) +{ + #ifdef HAVE_TRACING + p_category = NULL; + #endif + p_stateHookup.prev = 0; + p_stateHookup.next = 0; + if (failed) + p_stateSet = getModel()->getFailedActionSet(); + else + p_stateSet = getModel()->getRunningActionSet(); + + p_stateSet->push_back(*this); +} + +Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) + : m_priority(1.0) , m_refcount(1) + , m_remains(cost) + , m_maxDuration(NO_MAX_DURATION) + , m_finish(-1.0) + , m_failed(failed) + , m_start(surf_get_clock()) + , m_cost(cost) + , p_model(model) + , p_data(NULL) + , p_variable(var) + , m_lastValue(0) + , m_lastUpdate(0) + , m_suspended(false) { #ifdef HAVE_TRACING p_category = NULL; @@ -792,7 +814,7 @@ Action::Action(ModelPtr model, double cost, bool failed) else p_stateSet = getModel()->getRunningActionSet(); - xbt_swag_insert(this, p_stateSet); + p_stateSet->push_back(*this); } Action::~Action() { @@ -805,18 +827,6 @@ void Action::finish() { m_finish = surf_get_clock(); } -int Action::unref(){ - DIE_IMPOSSIBLE; -} - -void Action::cancel(){ - DIE_IMPOSSIBLE; -} - -void Action::recycle(){ - DIE_IMPOSSIBLE; -} - e_surf_action_state_t Action::getState() { if (p_stateSet == getModel()->getReadyActionSet()) @@ -834,8 +844,7 @@ void Action::setState(e_surf_action_state_t state) { //surf_action_state_t action_state = &(action->model_type->states); XBT_IN("(%p,%s)", this, surf_action_state_names[state]); - xbt_swag_remove(this, p_stateSet); - + p_stateSet->erase(p_stateSet->iterator_to(*this)); if (state == SURF_ACTION_READY) p_stateSet = getModel()->getReadyActionSet(); else if (state == SURF_ACTION_RUNNING) @@ -848,7 +857,23 @@ void Action::setState(e_surf_action_state_t state) p_stateSet = NULL; if (p_stateSet) - xbt_swag_insert(this, p_stateSet); + p_stateSet->push_back(*this); + XBT_OUT(); +} + +double Action::getBound() +{ + return (p_variable) ? lmm_variable_getbound(p_variable) : 0; +} + +void Action::setBound(double bound) +{ + XBT_IN("(%p,%g)", this, bound); + if (p_variable) + lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); + + if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock()) + heapRemove(getModel()->getActionHeap()); XBT_OUT(); } @@ -863,13 +888,6 @@ double Action::getFinishTime() return m_remains == 0 ? m_finish : -1; } -double Action::getRemains() -{ - XBT_IN("(%p)", this); - XBT_OUT(); - return m_remains; -} - void Action::setData(void* data) { p_data = data; @@ -888,7 +906,7 @@ void Action::ref(){ m_refcount++; } -void ActionLmm::setMaxDuration(double duration) +void Action::setMaxDuration(double duration) { XBT_IN("(%p,%g)", this, duration); m_maxDuration = duration; @@ -897,9 +915,9 @@ void ActionLmm::setMaxDuration(double duration) XBT_OUT(); } -void ActionLmm::gapRemove() {} +void Action::gapRemove() {} -void ActionLmm::setPriority(double priority) +void Action::setPriority(double priority) { XBT_IN("(%p,%g)", this, priority); m_priority = priority; @@ -910,24 +928,27 @@ void ActionLmm::setPriority(double priority) XBT_OUT(); } -void ActionLmm::cancel(){ +void Action::cancel(){ setState(SURF_ACTION_FAILED); if (getModel()->getUpdateMechanism() == UM_LAZY) { - xbt_swag_remove(this, getModel()->getModifiedSet()); + if (actionLmmHook::is_linked()) + getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); heapRemove(getModel()->getActionHeap()); } } -int ActionLmm::unref(){ +int Action::unref(){ m_refcount--; if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); + if (actionHook::is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); if (getModel()->getUpdateMechanism() == UM_LAZY) { /* remove from heap */ heapRemove(getModel()->getActionHeap()); - xbt_swag_remove(this, getModel()->getModifiedSet()); + if (actionLmmHook::is_linked()) + getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); } delete this; return 1; @@ -935,7 +956,7 @@ int ActionLmm::unref(){ return 0; } -void ActionLmm::suspend() +void Action::suspend() { XBT_IN("(%p)", this); if (m_suspended != 2) { @@ -947,7 +968,7 @@ void ActionLmm::suspend() XBT_OUT(); } -void ActionLmm::resume() +void Action::resume() { XBT_IN("(%p)", this); if (m_suspended != 2) { @@ -959,7 +980,7 @@ void ActionLmm::resume() XBT_OUT(); } -bool ActionLmm::isSuspended() +bool Action::isSuspended() { return m_suspended == 1; } @@ -970,13 +991,13 @@ bool ActionLmm::isSuspended() * LATENCY = this is a heap entry to warn us when the latency is payed * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached */ -void ActionLmm::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat) +void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat) { m_hat = hat; xbt_heap_push(heap, this, key); } -void ActionLmm::heapRemove(xbt_heap_t heap) +void Action::heapRemove(xbt_heap_t heap) { m_hat = NOTSET; if (m_indexHeap >= 0) { @@ -986,14 +1007,14 @@ void ActionLmm::heapRemove(xbt_heap_t heap) /* added to manage the communication action's heap */ void surf_action_lmm_update_index_heap(void *action, int i) { - ((ActionLmmPtr)action)->updateIndexHeap(i); + ((ActionPtr)action)->updateIndexHeap(i); } -void ActionLmm::updateIndexHeap(int i) { +void Action::updateIndexHeap(int i) { m_indexHeap = i; } -double ActionLmm::getRemains() +double Action::getRemains() { XBT_IN("(%p)", this); /* update remains before return it */ @@ -1003,8 +1024,13 @@ double ActionLmm::getRemains() return m_remains; } +double Action::getRemainsNoUpdate() +{ + return m_remains; +} + //FIXME split code in the right places -void ActionLmm::updateRemainingLazy(double now) +void Action::updateRemainingLazy(double now) { double delta = 0.0; @@ -1061,23 +1087,3 @@ void ActionLmm::updateRemainingLazy(double now) m_lastValue = lmm_variable_getvalue(getVariable()); } -/*void Action::cancel() -{ - p_model->notifyActionCancel(this); -} - -void Action::suspend() -{ - p_model->notifyActionSuspend(this); -} - -void Action::resume() -{ - p_model->notifyActionResume(this); -} - -bool Action::isSuspended() -{ - return false; -}*/ -