X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bb40307f3fde0e2802daaa98c9a6ea2739f290d4..93b7899156ac9fee75c4a6a8b65b92b265d61d4f:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index f1ca84dd59..75d589d84a 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" @@ -37,12 +41,15 @@ void surf_host_model_init_ptask_L07(void) 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); @@ -263,21 +270,9 @@ Action *HostL07Model::executeParallelTask(int host_nb, return action; } -Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu) +Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props) { - 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, netElm, cpu); - - surf_callback_emit(hostCreatedCallbacks, wk); - xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk); - - return wk; + return new HostL07(this, name, props, netElm, cpu); } Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, @@ -310,20 +305,11 @@ Cpu *CpuL07Model::createCpu(const char *name, 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); - 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, name, power_initial, power_scale, power_trace, core, state_initial, state_trace); - sg_host_surfcpu_register(sg_host, cpu); return cpu; } @@ -375,7 +361,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 */ @@ -419,18 +405,18 @@ HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEd { } -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, const char* name, + 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, state_initial) + : Cpu(model, name, 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; if (state_trace) p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); @@ -466,12 +452,12 @@ Action *CpuL07::execute(double size) double *flops_amount = xbt_new0(double, 1); double *bytes_amount = xbt_new0(double, 1); - host_list[0] = sg_host_by_name(getName()); + host_list[0] = getHost(); flops_amount[0] = size; - return static_cast(getModel())->executeParallelTask(1, host_list, - flops_amount, - bytes_amount, -1); + return static_cast(getModel()) + ->p_hostModel + ->executeParallelTask( 1, host_list, flops_amount, bytes_amount, -1); } Action *CpuL07::sleep(double duration) @@ -499,11 +485,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); @@ -558,11 +544,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; @@ -576,12 +557,6 @@ void LinkL07::updateLatency(double value, double date) } } - -bool LinkL07::isShared() -{ - return lmm_constraint_is_shared(getConstraint()); -} - /********** * Action * **********/ @@ -618,7 +593,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)); } } @@ -687,3 +663,6 @@ double L07Action::getRemains() XBT_OUT(); return m_remains; } + +} +}