/* 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 <cstdlib>
+
+#include <algorithm>
+
#include "host_ptask_L07.hpp"
#include "cpu_interface.hpp"
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);
HostL07 *host = new HostL07(this, name, NULL, netElm, cpu);
surf_callback_emit(hostCreatedCallbacks, host);
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host);
+ simgrid::Host::get_host(name)->set_facet(SURF_HOST_LEVEL, host);
return host;
}
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 */
}
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, state_initial)
+ : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, speedInitial * speedScale),
+ core, speedInitial, speedScale, state_initial)
{
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);
host_list[0] = sg_host_by_name(getName());
flops_amount[0] = size;
- return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
- flops_amount,
- bytes_amount, -1);
+ return static_cast<CpuL07Model*>(getModel())
+ ->p_hostModel
+ ->executeParallelTask( 1, host_list, flops_amount, bytes_amount, -1);
}
Action *CpuL07::sleep(double duration)
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) {
+ 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);
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));
}
}
XBT_OUT();
return m_remains;
}
+
+}
+}