X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b8a3e821fc6fd4403ddf71cf9e2e09c03f7ce7..4736926935eb52f1e561715d2fa5a3fc4144a188:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 2114c977cd..700aa0c44f 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -4,6 +4,10 @@ /* 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" @@ -34,17 +38,18 @@ 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; + surf_host_model = new simgrid::surf::HostL07Model(); + simgrid::surf::Model *model = surf_host_model; xbt_dynar_push(all_existing_models, &model); } +namespace simgrid { +namespace surf { + HostL07Model::HostL07Model() : HostModel() { if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(1); @@ -265,24 +270,6 @@ Action *HostL07Model::executeParallelTask(int host_nb, return action; } -Host *HostL07Model::createHost(const char *name) -{ - 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)); - surf_callback_emit(hostCreatedCallbacks, wk); - xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk); - - return wk; -} - Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate) { @@ -302,34 +289,15 @@ Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, return res; } -xbt_dynar_t HostL07Model::getRoute(Host *src, Host *dst) -{ - xbt_dynar_t route=NULL; - routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL); - return route; -} - -Cpu *CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, +Cpu *CpuL07Model::createCpu(simgrid::Host *host, xbt_dynar_t powerPeak, int pstate, double power_scale, tmgr_trace_t power_trace, int core, e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) + tmgr_trace_t state_trace) { 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, + CpuL07 *cpu = new CpuL07(this, host, power_initial, power_scale, power_trace, core, state_initial, state_trace); - - sg_host_surfcpu_set(sg_host, cpu); - return cpu; } @@ -346,11 +314,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); + Link::onCreation(link); + return link; } void HostL07Model::addTraces() @@ -379,7 +349,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 */ @@ -417,55 +387,27 @@ void HostL07Model::addTraces() /************ * Resource * ************/ - -HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEdge *netElm, Cpu *cpu) - : Host(model, name, props, NULL, netElm, cpu) -{ -} - -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, +CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host, + 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, host, 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); } +CpuL07::~CpuL07() +{ +} + LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, double bw_initial, tmgr_trace_t bw_trace, @@ -490,6 +432,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] = getHost(); + 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()); } @@ -500,11 +471,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); @@ -543,39 +514,6 @@ void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double da return; } -e_surf_resource_state_t HostL07::getState() { - return p_cpu->getState(); -} - -Action *HostL07::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())->executeParallelTask(1, host_list, - flops_amount, - bytes_amount, -1); -} - -Action *HostL07::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; -} - double LinkL07::getBandwidth() { return m_bwCurrent; @@ -587,11 +525,6 @@ 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; @@ -605,12 +538,6 @@ void LinkL07::updateLatency(double value, double date) } } - -bool LinkL07::isShared() -{ - return lmm_constraint_is_shared(getConstraint()); -} - /********** * Action * **********/ @@ -647,7 +574,8 @@ void L07Action::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)); } } @@ -716,3 +644,6 @@ double L07Action::getRemains() XBT_OUT(); return m_remains; } + +} +}