X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index fc4babc90d..06001baa61 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,11 +1,16 @@ +/* Copyright (c) 2013-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 "network_constant.hpp" #include "surf/random_mgr.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -static random_data_t random_latency = NULL; static int host_number_int = 0; -static void netcste_count_hosts(sg_platf_host_cbarg_t h) { +static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) { host_number_int++; } @@ -17,105 +22,99 @@ void surf_network_model_init_Constant() xbt_assert(surf_network_model == NULL); surf_network_model = new NetworkConstantModel(); - if (!random_latency) - random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034); - - //FIXME:sg_platf_host_add_cb(netcste_count_hosts); - - xbt_dynar_push(model_list, &surf_network_model); + sg_platf_host_add_cb(netcste_count_hosts); - //FIXME:routing_model_create(NULL); + ModelPtr model = surf_network_model; + xbt_dynar_push(model_list, &model); } -double NetworkConstantModel::shareResources(double now) +double NetworkConstantModel::shareResources(double /*now*/) { - void *_action = NULL; - NetworkConstantActionLmmPtr action = NULL; + NetworkConstantActionPtr action = NULL; double min = -1.0; - xbt_swag_foreach(_action, p_runningActionSet) { - action = (NetworkConstantActionLmmPtr) _action; - if (action->m_latency > 0) { - if (min < 0) - min = action->m_latency; - else if (action->m_latency < min) - min = action->m_latency; - } + ActionListPtr actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) + ; it != itend ; ++it) { + action = static_cast(&*it); + if (action->m_latency > 0 && (min < 0 || action->m_latency < min)) + min = action->m_latency; } return min; } -void NetworkConstantModel::updateActionsState(double now, double delta) +void NetworkConstantModel::updateActionsState(double /*now*/, double delta) { - void *_action, *_next_action; - NetworkConstantActionLmmPtr action = NULL; - - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = (NetworkConstantActionLmmPtr) _action; + NetworkConstantActionPtr action = NULL; + ActionListPtr actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) + ; it != itend ; it=itNext) { + ++itNext; + action = static_cast(&*it); if (action->m_latency > 0) { if (action->m_latency > delta) { - double_update(&(action->m_latency), delta); + double_update(&(action->m_latency), delta, sg_surf_precision); } else { action->m_latency = 0.0; } } - double_update(&(action->m_remains), - action->m_cost * delta / action->m_latInit); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&(action->m_maxDuration), delta); + action->updateRemains(action->getCost() * delta / action->m_latInit); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); - if (action->m_remains <= 0) { - action->m_finish = surf_get_clock(); + if (action->getRemainsNoUpdate() <= 0) { + action->finish(); action->setState(SURF_ACTION_DONE); - } else if ((action->m_maxDuration != NO_MAX_DURATION) - && (action->m_maxDuration <= 0)) { - action->m_finish = surf_get_clock(); + } else if ((action->getMaxDuration() != NO_MAX_DURATION) + && (action->getMaxDuration() <= 0)) { + action->finish(); action->setState(SURF_ACTION_DONE); } } } -NetworkCm02ActionLmmPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, +ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) { - char *src_name = src->p_name; - char *dst_name = dst->p_name; + char *src_name = src->getName(); + char *dst_name = dst->getName(); XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); - NetworkConstantActionLmmPtr action = new NetworkConstantActionLmm(this, sg_latency_factor); + NetworkConstantActionPtr action = new NetworkConstantAction(this, size, sg_latency_factor); XBT_OUT(); + surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate); return action; } /************ * Resource * ************/ -bool NetworkConstantLinkLmm::isUsed() +bool NetworkConstantLink::isUsed() { return 0; } -void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t event_type, - double value, double time) +void NetworkConstantLink::updateState(tmgr_trace_event_t /*event_type*/, + double /*value*/, double /*time*/) { DIE_IMPOSSIBLE; } -double NetworkConstantLinkLmm::getBandwidth() +double NetworkConstantLink::getBandwidth() { DIE_IMPOSSIBLE; return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ } -double NetworkConstantLinkLmm::getLatency() +double NetworkConstantLink::getLatency() { DIE_IMPOSSIBLE; return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ } -bool NetworkConstantLinkLmm::isShared() +bool NetworkConstantLink::isShared() { DIE_IMPOSSIBLE; return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ @@ -125,46 +124,45 @@ bool NetworkConstantLinkLmm::isShared() * Action * **********/ -int NetworkConstantActionLmm::unref() +int NetworkConstantAction::unref() { m_refcount--; if (!m_refcount) { - xbt_swag_remove(this, p_stateSet); + if (actionHook::is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); delete this; return 1; } return 0; } -void NetworkConstantActionLmm::cancel() +void NetworkConstantAction::cancel() { return; } -#ifdef HAVE_TRACING -void NetworkConstantActionLmm::setCategory(const char *category) +void NetworkConstantAction::setCategory(const char */*category*/) { //ignore completely the categories in constant model, they are not traced } -#endif -void NetworkConstantActionLmm::suspend() +void NetworkConstantAction::suspend() { m_suspended = true; } -void NetworkConstantActionLmm::resume() +void NetworkConstantAction::resume() { if (m_suspended) m_suspended = false; } -void NetworkConstantActionLmm::recycle() +void NetworkConstantAction::recycle() { return; } -bool NetworkConstantActionLmm::isSuspended() +bool NetworkConstantAction::isSuspended() { return m_suspended; }