X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f7d497f79d58024cf0ce2b918b1f8f87a830ebf..3cfe66e7d8b512b2153688ccca3aca992ac8148e:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 44e123d3bc..20b4d50ede 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -1,13 +1,18 @@ -/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2015. 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 + +#include + #include "host_ptask_L07.hpp" #include "cpu_interface.hpp" #include "surf_routing.hpp" +#include "xbt/lib.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); @@ -33,31 +38,30 @@ void surf_host_model_init_ptask_L07(void) xbt_assert(!surf_network_model, "network model type already defined"); // Define the callbacks to parse the XML - sg_platf_host_add_cb(cpu_parse_init); - sg_platf_host_add_cb(host_parse_init); sg_platf_link_add_cb(ptask_netlink_parse_init); sg_platf_postparse_add_cb(host_add_traces); - surf_host_model = new HostL07Model(); - Model *model = surf_host_model; - xbt_dynar_push(model_list, &model); - xbt_dynar_push(model_list_invoke, &model); + surf_host_model = new simgrid::surf::HostL07Model(); + simgrid::surf::Model *model = surf_host_model; + xbt_dynar_push(all_existing_models, &model); } -HostL07Model::HostL07Model() : HostModel("Host ptask_L07") { +namespace simgrid { +namespace surf { + +HostL07Model::HostL07Model() : HostModel() { if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(1); surf_host_model = NULL; - surf_network_model = new NetworkL07Model(); - surf_cpu_model_pm = new CpuL07Model(); + surf_network_model = new NetworkL07Model(this); + surf_cpu_model_pm = new CpuL07Model(this); routing_model_create(surf_network_model->createLink("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL)); - p_cpuModel = surf_cpu_model_pm; } HostL07Model::~HostL07Model() { @@ -75,7 +79,7 @@ HostL07Model::~HostL07Model() { double HostL07Model::shareResources(double /*now*/) { - HostL07Action *action; + L07Action *action; ActionList *running_actions = getRunningActionSet(); double min = this->shareResourcesMaxMin(running_actions, @@ -84,7 +88,7 @@ double HostL07Model::shareResources(double /*now*/) for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end()) ; it != itend ; ++it) { - action = static_cast(&*it); + action = static_cast(&*it); if (action->m_latency > 0) { if (min < 0) { min = action->m_latency; @@ -105,14 +109,14 @@ double HostL07Model::shareResources(double /*now*/) void HostL07Model::updateActionsState(double /*now*/, double delta) { - HostL07Action *action; + L07Action *action; ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it = actionSet->begin(), itNext = it ; it != actionSet->end() ; it = itNext) { ++itNext; - action = static_cast(&*it); + action = static_cast(&*it); if (action->m_latency > 0) { if (action->m_latency > delta) { double_update(&(action->m_latency), delta, sg_surf_precision); @@ -168,26 +172,29 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { } Action *HostL07Model::executeParallelTask(int host_nb, - void **host_list, + sg_host_t*host_list, double *flops_amount, double *bytes_amount, double rate) { - HostL07Action *action; - int i, j; + L07Action *action = new L07Action(this, 1, 0); unsigned int cpt; int nb_link = 0; int nb_host = 0; double latency = 0.0; + action->p_edgeList->reserve(host_nb); + for (int i = 0; ip_edgeList->push_back(sg_host_edge(host_list[i])); + if (ptask_parallel_task_link_set == NULL) ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); xbt_dict_reset(ptask_parallel_task_link_set); /* Compute the number of affected resources... */ - for (i = 0; i < host_nb; i++) { - for (j = 0; j < host_nb; j++) { + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { xbt_dynar_t route=NULL; if (bytes_amount[i * host_nb + j] > 0) { @@ -196,10 +203,8 @@ Action *HostL07Model::executeParallelTask(int host_nb, void *_link; LinkL07 *link; - routing_platf->getRouteAndLatency(static_cast(host_list[i])->p_netElm, - static_cast(host_list[j])->p_netElm, - &route, - &lat); + routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j], + &route, &lat); latency = MAX(latency, lat); xbt_dynar_foreach(route, cpt, _link) { @@ -213,49 +218,43 @@ Action *HostL07Model::executeParallelTask(int host_nb, nb_link = xbt_dict_length(ptask_parallel_task_link_set); xbt_dict_reset(ptask_parallel_task_link_set); - for (i = 0; i < host_nb; i++) + for (int i = 0; i < host_nb; i++) if (flops_amount[i] > 0) nb_host++; - action = new HostL07Action(this, 1, 0); XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", action, host_nb, nb_link); - action->m_suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - action->m_hostNb = host_nb; - action->p_hostList = (Host **) host_list; + action->m_suspended = 0; /* valgrind seems to want it despite the calloc... */ action->p_computationAmount = flops_amount; action->p_communicationAmount = bytes_amount; action->m_latency = latency; action->m_rate = rate; action->p_variable = lmm_variable_new(ptask_maxmin_system, action, 1.0, - (action->m_rate > 0) ? action->m_rate : -1.0, - host_nb + nb_link); + (rate > 0 ? rate : -1.0), + host_nb + nb_link); if (action->m_latency > 0) lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); - for (i = 0; i < host_nb; i++) + for (int i = 0; i < host_nb; i++) lmm_expand(ptask_maxmin_system, - static_cast(host_list[i])->p_cpu->getConstraint(), + sg_host_surfcpu(host_list[i])->getConstraint(), action->getVariable(), flops_amount[i]); - for (i = 0; i < host_nb; i++) { - for (j = 0; j < host_nb; j++) { + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { void *_link; - LinkL07 *link; xbt_dynar_t route=NULL; if (bytes_amount[i * host_nb + j] == 0.0) continue; - routing_platf->getRouteAndLatency(static_cast(host_list[i])->p_netElm, - static_cast(host_list[j])->p_netElm, + routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j], &route, NULL); xbt_dynar_foreach(route, cpt, _link) { - link = static_cast(_link); + LinkL07 *link = static_cast(_link); lmm_expand_add(ptask_maxmin_system, link->getConstraint(), action->getVariable(), bytes_amount[i * host_nb + j]); @@ -271,37 +270,29 @@ Action *HostL07Model::executeParallelTask(int host_nb, return action; } -Host *HostL07Model::createHost(const char *name) +Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu) { - HostL07 *wk = NULL; - sg_host_t sg_host = sg_host_by_name(name); - - xbt_assert(!surf_host_resource_priv(sg_host), - "Host '%s' declared several times in the platform file.", - name); - - wk = new HostL07(this, name, NULL, - sg_host_edge(sg_host), - sg_host_surfcpu(sg_host)); + HostL07 *host = new HostL07(this, name, NULL, netElm, cpu); - xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk); + surf_callback_emit(hostCreatedCallbacks, host); + simgrid::Host::get_host(name)->set_facet(SURF_HOST_LEVEL, host); - return wk; + return host; } -Action *HostL07Model::communicate(Host *src, Host *dst, +Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate) { - void **host_list = xbt_new0(void *, 2); + sg_host_t*host_list = xbt_new0(sg_host_t, 2); double *flops_amount = xbt_new0(double, 2); double *bytes_amount = xbt_new0(double, 4); Action *res = NULL; - host_list[0] = src; - host_list[1] = dst; + host_list[0] = sg_host_by_name(src->getName()); + host_list[1] = sg_host_by_name(dst->getName()); bytes_amount[1] = size; - res = executeParallelTask(2, host_list, + res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); @@ -323,19 +314,12 @@ Cpu *CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, xbt_dict_t cpu_properties) { double power_initial = xbt_dynar_get_as(powerPeak, pstate, double); - xbt_dynar_free(&powerPeak); // kill memory leak sg_host_t sg_host = sg_host_by_name(name); - xbt_assert(!surf_host_resource_priv(sg_host), - "Host '%s' declared several times in the platform file.", - name); - CpuL07 *cpu = new CpuL07(this, name, cpu_properties, power_initial, power_scale, power_trace, core, state_initial, state_trace); - - sg_host_surfcpu_set(sg_host, cpu); - + sg_host_surfcpu_register(sg_host, cpu); return cpu; } @@ -352,11 +336,13 @@ Link* NetworkL07Model::createLink(const char *name, xbt_assert(!Link::byName(name), "Link '%s' declared several times in the platform file.", name); - return new LinkL07(this, name, properties, + Link* link = new LinkL07(this, name, properties, bw_initial, bw_trace, lat_initial, lat_trace, state_initial, state_trace, policy); + surf_callback_emit(networkLinkCreatedCallbacks, link); + return link; } void HostL07Model::addTraces() @@ -385,7 +371,7 @@ void HostL07Model::addTraces() xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_powerEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); + host->p_speedEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); } /* Connect traces relative to network */ @@ -429,45 +415,19 @@ HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEd { } -double HostL07::getPowerPeakAt(int /*pstate_index*/) -{ - THROW_UNIMPLEMENTED; -} - -int HostL07::getNbPstates() -{ - THROW_UNIMPLEMENTED; -} - -void HostL07::setPstate(int /*pstate_index*/) -{ - THROW_UNIMPLEMENTED; -} - -int HostL07::getPstate() -{ - THROW_UNIMPLEMENTED; -} - -double HostL07::getConsumedEnergy() -{ - THROW_UNIMPLEMENTED; -} - CpuL07::CpuL07(CpuL07Model *model, const char* name, xbt_dict_t props, - double power_initial, double power_scale, tmgr_trace_t power_trace, + double speedInitial, double speedScale, tmgr_trace_t speedTrace, int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace) - : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale), - core, power_initial, power_scale) + : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, speedInitial * speedScale), + core, speedInitial, speedScale, state_initial) { - xbt_assert(m_powerScale > 0, "Power has to be >0"); + xbt_assert(m_speedScale > 0, "Power has to be >0"); - if (power_trace) - p_powerEvent = tmgr_history_add_trace(history, power_trace, 0.0, 0, this); + if (speedTrace) + p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); else - p_powerEvent = NULL; + p_speedEvent = NULL; - setState(state_initial); if (state_trace) p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); } @@ -496,6 +456,35 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, lmm_constraint_shared(getConstraint()); } +Action *CpuL07::execute(double size) +{ + sg_host_t*host_list = xbt_new0(sg_host_t, 1); + double *flops_amount = xbt_new0(double, 1); + double *bytes_amount = xbt_new0(double, 1); + + host_list[0] = sg_host_by_name(getName()); + flops_amount[0] = size; + + return static_cast(getModel()) + ->p_hostModel + ->executeParallelTask( 1, host_list, flops_amount, bytes_amount, -1); +} + +Action *CpuL07::sleep(double duration) +{ + L07Action *action = NULL; + + XBT_IN("(%s,%g)", getName(), duration); + + action = static_cast(execute(1.0)); + action->m_maxDuration = duration; + action->m_suspended = 2; + lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); + + XBT_OUT(); + return action; +} + bool CpuL07::isUsed(){ return lmm_constraint_used(ptask_maxmin_system, getConstraint()); } @@ -506,11 +495,11 @@ bool LinkL07::isUsed(){ void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double /*date*/){ XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); - if (event_type == p_powerEvent) { - m_powerScale = value; - lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_powerPeak * m_powerScale); + if (event_type == p_speedEvent) { + m_speedScale = value; + lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_speedPeak * m_speedScale); if (tmgr_trace_event_free(event_type)) - p_powerEvent = NULL; + p_speedEvent = NULL; } else if (event_type == p_stateEvent) { if (value > 0) setState(SURF_RESOURCE_ON); @@ -553,35 +542,6 @@ e_surf_resource_state_t HostL07::getState() { return p_cpu->getState(); } -Action *HostL07::execute(double size) -{ - void **host_list = xbt_new0(void *, 1); - double *flops_amount = xbt_new0(double, 1); - double *bytes_amount = xbt_new0(double, 1); - - host_list[0] = this; - bytes_amount[0] = 0.0; - flops_amount[0] = size; - - return static_cast(getModel())->executeParallelTask(1, host_list, - flops_amount, - bytes_amount, -1); -} - -Action *HostL07::sleep(double duration) -{ - HostL07Action *action = NULL; - - XBT_IN("(%s,%g)", getName(), duration); - - action = static_cast(execute(1.0)); - action->m_maxDuration = duration; - action->m_suspended = 2; - lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); - - XBT_OUT(); - return action; -} double LinkL07::getBandwidth() { @@ -594,57 +554,46 @@ void LinkL07::updateBandwidth(double value, double date) lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_bwCurrent); } -double LinkL07::getLatency() -{ - return m_latCurrent; -} - void LinkL07::updateLatency(double value, double date) { lmm_variable_t var = NULL; - HostL07Action *action; + L07Action *action; lmm_element_t elem = NULL; m_latCurrent = value; while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, getConstraint(), &elem))) { - action = static_cast(lmm_variable_id(var)); + action = static_cast(lmm_variable_id(var)); action->updateBound(); } } - -bool LinkL07::isShared() -{ - return lmm_constraint_is_shared(getConstraint()); -} - /********** * Action * **********/ -HostL07Action::~HostL07Action(){ - free(p_hostList); +L07Action::~L07Action(){ free(p_communicationAmount); free(p_computationAmount); } -void HostL07Action::updateBound() +void L07Action::updateBound() { double lat_current = 0.0; double lat_bound = -1.0; int i, j; - for (i = 0; i < m_hostNb; i++) { - for (j = 0; j < m_hostNb; j++) { + int hostNb = p_edgeList->size(); + + for (i = 0; i < hostNb; i++) { + for (j = 0; j < hostNb; j++) { xbt_dynar_t route=NULL; - if (p_communicationAmount[i * m_hostNb + j] > 0) { + if (p_communicationAmount[i * hostNb + j] > 0) { double lat = 0.0; - routing_platf->getRouteAndLatency(static_cast(((void**)p_hostList)[i])->p_netElm, - static_cast(((void**)p_hostList)[j])->p_netElm, + routing_platf->getRouteAndLatency((*p_edgeList)[i], (*p_edgeList)[j], &route, &lat); - lat_current = MAX(lat_current, lat * p_communicationAmount[i * m_hostNb + j]); + lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]); } } } @@ -654,15 +603,16 @@ void HostL07Action::updateBound() if (m_rate < 0) lmm_update_variable_bound(ptask_maxmin_system, getVariable(), lat_bound); else - lmm_update_variable_bound(ptask_maxmin_system, getVariable(), min(m_rate, lat_bound)); + lmm_update_variable_bound(ptask_maxmin_system, getVariable(), + std::min(m_rate, lat_bound)); } } -int HostL07Action::unref() +int L07Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(ptask_maxmin_system, getVariable()); @@ -672,13 +622,13 @@ int HostL07Action::unref() return 0; } -void HostL07Action::cancel() +void L07Action::cancel() { setState(SURF_ACTION_FAILED); return; } -void HostL07Action::suspend() +void L07Action::suspend() { XBT_IN("(%p))", this); if (m_suspended != 2) { @@ -688,7 +638,7 @@ void HostL07Action::suspend() XBT_OUT(); } -void HostL07Action::resume() +void L07Action::resume() { XBT_IN("(%p)", this); if (m_suspended != 2) { @@ -698,28 +648,31 @@ void HostL07Action::resume() XBT_OUT(); } -bool HostL07Action::isSuspended() +bool L07Action::isSuspended() { return m_suspended == 1; } -void HostL07Action::setMaxDuration(double duration) +void L07Action::setMaxDuration(double duration) { /* FIXME: should inherit */ XBT_IN("(%p,%g)", this, duration); m_maxDuration = duration; XBT_OUT(); } -void HostL07Action::setPriority(double priority) +void L07Action::setPriority(double priority) { /* FIXME: should inherit */ XBT_IN("(%p,%g)", this, priority); m_priority = priority; XBT_OUT(); } -double HostL07Action::getRemains() +double L07Action::getRemains() { XBT_IN("(%p)", this); XBT_OUT(); return m_remains; } + +} +}