/* 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"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
-static int ptask_host_count = 0;
-static xbt_dict_t ptask_parallel_task_link_set = NULL;
lmm_system_t ptask_maxmin_system = NULL;
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(all_existing_models, &model);
+ surf_host_model = new simgrid::surf::HostL07Model();
+ xbt_dynar_push(all_existing_models, &surf_host_model);
}
+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(this);
- surf_cpu_model_pm = new CpuL07Model(this);
+ p_maxminSystem = ptask_maxmin_system;
+ surf_network_model = new NetworkL07Model(this,ptask_maxmin_system);
+ surf_cpu_model_pm = new CpuL07Model(this,ptask_maxmin_system);
routing_model_create(surf_network_model->createLink("__loopback__",
498000000, NULL,
}
HostL07Model::~HostL07Model() {
- xbt_dict_free(&ptask_parallel_task_link_set);
-
delete surf_cpu_model_pm;
delete surf_network_model;
- ptask_host_count = 0;
- if (ptask_maxmin_system) {
- lmm_system_free(ptask_maxmin_system);
- ptask_maxmin_system = NULL;
- }
+ ptask_maxmin_system = NULL; // freed as part of ~Model (it's also stored as p_maxminSystem)
+}
+
+CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
+ : CpuModel()
+ , p_hostModel(hmodel)
+ {
+ p_maxminSystem = sys;
+ }
+CpuL07Model::~CpuL07Model() {
+ surf_cpu_model_pm = NULL;
+ p_maxminSystem = NULL; // Avoid multi-free
+}
+NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
+ : NetworkModel()
+ , p_hostModel(hmodel)
+ {
+ p_maxminSystem = sys;
+ }
+NetworkL07Model::~NetworkL07Model()
+{
+ surf_network_model = NULL;
+ p_maxminSystem = NULL; // Avoid multi-free
}
+
double HostL07Model::shareResources(double /*now*/)
{
L07Action *action;
L07Action *action = new L07Action(this, 1, 0);
unsigned int cpt;
int nb_link = 0;
- int nb_host = 0;
+ int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
double latency = 0.0;
+ xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
+
action->p_edgeList->reserve(host_nb);
for (int i = 0; i<host_nb; i++)
action->p_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 (int i = 0; i < host_nb; i++) {
for (int j = 0; j < host_nb; j++) {
}
nb_link = xbt_dict_length(ptask_parallel_task_link_set);
- xbt_dict_reset(ptask_parallel_task_link_set);
+ xbt_dict_free(&ptask_parallel_task_link_set);
for (int i = 0; i < host_nb; i++)
if (flops_amount[i] > 0)
- nb_host++;
+ nb_used_host++;
XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
action, host_nb, nb_link);
}
}
- if (nb_link + nb_host == 0) {
+ if (nb_link + nb_used_host == 0) {
action->setCost(1.0);
action->setRemains(0.0);
}
return action;
}
-Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu)
-{
- HostL07 *host = new HostL07(this, name, NULL, netElm, cpu);
-
- surf_callback_emit(hostCreatedCallbacks, host);
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host);
-
- return host;
-}
-
Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
double size, double rate)
{
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 powerPeakList,
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);
-
- CpuL07 *cpu = new CpuL07(this, name, cpu_properties,
- power_initial, power_scale, power_trace,
+ CpuL07 *cpu = new CpuL07(this, host, powerPeakList, pstate, power_scale, power_trace,
core, state_initial, state_trace);
- sg_host_surfcpu_register(sg_host, cpu);
return cpu;
}
lat_initial, lat_trace,
state_initial, state_trace,
policy);
- surf_callback_emit(networkLinkCreatedCallbacks, link);
+ Link::onCreation(link);
return link;
}
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 */
* Resource *
************/
-HostL07::HostL07(HostModel *model, const char* name, xbt_dict_t props, RoutingEdge *netElm, Cpu *cpu)
- : Host(model, name, props, NULL, netElm, cpu)
+CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host,
+ xbt_dynar_t speedPeakList, int pstate,
+ double speedScale, tmgr_trace_t speedTrace,
+ int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
+ : Cpu(model, host, speedPeakList, pstate,
+ core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, state_initial)
{
-}
+ xbt_assert(m_speedScale > 0, "Power has to be >0");
+ p_constraint = lmm_constraint_new(ptask_maxmin_system, this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
-CpuL07::CpuL07(CpuL07Model *model, const char* name, xbt_dict_t props,
- double power_initial, double power_scale, tmgr_trace_t power_trace,
- 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)
-{
- xbt_assert(m_powerScale > 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);
}
+CpuL07::~CpuL07()
+{
+}
+
LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
double bw_initial,
tmgr_trace_t bw_trace,
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<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) {
- 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);
return;
}
-e_surf_resource_state_t HostL07::getState() {
- return p_cpu->getState();
-}
-
-
double LinkL07::getBandwidth()
{
return m_bwCurrent;
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;
}
}
-
-bool LinkL07::isShared()
-{
- return lmm_constraint_is_shared(getConstraint());
-}
-
/**********
* Action *
**********/
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;
}
+
+}
+}
