#include "cpu_interface.hpp"
#include "surf_routing.hpp"
#include "xbt/lib.h"
+#include "src/surf/platform.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;
-
+XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
/**************************************/
/*** Resource Creation & Destruction **/
void surf_host_model_init_ptask_L07(void)
{
- XBT_INFO("Switching to the L07 model to handle parallel tasks.");
+ XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks.");
xbt_assert(!surf_cpu_model_pm, "CPU model type already defined");
xbt_assert(!surf_network_model, "network model type already defined");
// Define the callbacks to parse the XML
- sg_platf_link_add_cb(ptask_netlink_parse_init);
- sg_platf_postparse_add_cb(host_add_traces);
+ simgrid::surf::on_link.connect(ptask_netlink_parse_init);
+ simgrid::surf::on_postparse.connect([](){
+ surf_host_model->addTraces();
+ });
surf_host_model = new simgrid::surf::HostL07Model();
- simgrid::surf::Model *model = surf_host_model;
- xbt_dynar_push(all_existing_models, &model);
+ xbt_dynar_push(all_existing_models, &surf_host_model);
}
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 = lmm_system_new(1);
+ surf_network_model = new NetworkL07Model(this,p_maxminSystem);
+ surf_cpu_model_pm = new CpuL07Model(this,p_maxminSystem);
routing_model_create(surf_network_model->createLink("__loopback__",
498000000, NULL,
0.000015, NULL,
- SURF_RESOURCE_ON, NULL,
+ 1/*ON*/, NULL,
SURF_LINK_FATPIPE, 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;
- }
+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;
ActionList *running_actions = getRunningActionSet();
double min = this->shareResourcesMaxMin(running_actions,
- ptask_maxmin_system,
+ p_maxminSystem,
bottleneck_solve);
for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end())
}
if ((action->m_latency == 0.0) && (action->isSuspended() == 0)) {
action->updateBound();
- lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 1.0);
+ lmm_update_variable_weight(p_maxminSystem, action->getVariable(), 1.0);
}
}
XBT_DEBUG("Action (%p) : remains (%g) updated by %g.",
lmm_constraint_t cnst = NULL;
int i = 0;
- while ((cnst = lmm_get_cnst_from_var(ptask_maxmin_system, action->getVariable(), i++))) {
+ while ((cnst = lmm_get_cnst_from_var(p_maxminSystem, action->getVariable(), i++))) {
void *constraint_id = lmm_constraint_id(cnst);
- if (static_cast<Host*>(constraint_id)->getState() == SURF_RESOURCE_OFF) {
+ if (static_cast<Host*>(constraint_id)->isOff()) {
XBT_DEBUG("Action (%p) Failed!!", action);
action->finish();
action->setState(SURF_ACTION_FAILED);
return;
}
-Action *HostL07Model::executeParallelTask(int host_nb,
- sg_host_t*host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate)
+Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
+ double *flops_amount, double *bytes_amount,
+ double rate) {
+ return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
+}
+
+
+L07Action::L07Action(Model *model, int host_nb,
+ sg_host_t*host_list,
+ double *flops_amount,
+ double *bytes_amount,
+ double rate)
+ : CpuAction(model, 1, 0)
{
- 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;
- 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_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
- xbt_dict_reset(ptask_parallel_task_link_set);
+ this->p_netcardList->reserve(host_nb);
+ for (int i = 0; i<host_nb; i++)
+ this->p_netcardList->push_back(host_list[i]->pimpl_netcard);
/* Compute the number of affected resources... */
for (int i = 0; i < host_nb; i++) {
void *_link;
LinkL07 *link;
- routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j],
&route, &lat);
latency = MAX(latency, lat);
}
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);
- 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,
+ this, host_nb, nb_link);
+ this->p_computationAmount = flops_amount;
+ this->p_communicationAmount = bytes_amount;
+ this->m_latency = latency;
+ this->m_rate = rate;
+
+ this->p_variable = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
(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);
+ if (this->m_latency > 0)
+ lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0);
for (int i = 0; i < host_nb; i++)
- lmm_expand(ptask_maxmin_system,
- sg_host_surfcpu(host_list[i])->getConstraint(),
- action->getVariable(), flops_amount[i]);
+ lmm_expand(model->getMaxminSystem(),
+ host_list[i]->pimpl_cpu->getConstraint(),
+ this->getVariable(), flops_amount[i]);
for (int i = 0; i < host_nb; i++) {
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j],
&route, NULL);
xbt_dynar_foreach(route, cpt, _link) {
LinkL07 *link = static_cast<LinkL07*>(_link);
- lmm_expand_add(ptask_maxmin_system, link->getConstraint(),
- action->getVariable(),
+ lmm_expand_add(model->getMaxminSystem(), link->getConstraint(),
+ this->getVariable(),
bytes_amount[i * host_nb + j]);
}
}
}
- if (nb_link + nb_host == 0) {
- action->setCost(1.0);
- action->setRemains(0.0);
+ if (nb_link + nb_used_host == 0) {
+ this->setCost(1.0);
+ this->setRemains(0.0);
}
-
- return action;
}
-Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props)
-{
- return new simgrid::surf::Host(this, name, props,
- (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
- netElm, cpu);
-}
-
-Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
sg_host_t*host_list = xbt_new0(sg_host_t, 2);
return res;
}
-Cpu *CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak,
+Cpu *CpuL07Model::createCpu(simgrid::s4u::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,
+ int initiallyOn,
tmgr_trace_t state_trace)
{
- double power_initial = xbt_dynar_get_as(powerPeak, pstate, double);
- CpuL07 *cpu = new CpuL07(this, name, power_initial, power_scale, power_trace,
- core, state_initial, state_trace);
+ CpuL07 *cpu = new CpuL07(this, host, powerPeakList, pstate, power_scale, power_trace,
+ core, initiallyOn, state_trace);
return cpu;
}
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
+ int initiallyOn,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties)
Link* link = new LinkL07(this, name, properties,
bw_initial, bw_trace,
lat_initial, lat_trace,
- state_initial, state_trace,
+ initiallyOn, state_trace,
policy);
Link::onCreation(link);
return link;
/* Connect traces relative to cpu */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuL07 *host = static_cast<CpuL07*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuL07 *host = static_cast<CpuL07*>(sg_host_by_name(elm)->pimpl_cpu);
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuL07 *host = static_cast<CpuL07*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuL07 *host = static_cast<CpuL07*>(sg_host_by_name(elm)->pimpl_cpu);
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
/************
* Resource *
************/
-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, lmm_constraint_new(ptask_maxmin_system, this, speedInitial * speedScale),
- core, speedInitial, speedScale, state_initial)
+
+CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host,
+ xbt_dynar_t speedPeakList, int pstate,
+ double speedScale, tmgr_trace_t speedTrace,
+ int core, int initiallyOn, tmgr_trace_t state_trace)
+ : Cpu(model, host, speedPeakList, pstate,
+ core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, initiallyOn)
{
- xbt_assert(m_speedScale > 0, "Power has to be >0");
+ p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
if (speedTrace)
p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this);
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
+ int initiallyOn,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy)
- : Link(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, bw_initial), history, state_trace)
+ : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), history, state_trace)
{
m_bwCurrent = bw_initial;
if (bw_trace)
p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, this);
- setState(state_initial);
+ if (initiallyOn)
+ turnOn();
+ else
+ turnOff();
m_latCurrent = lat_initial;
if (lat_trace)
action = static_cast<L07Action*>(execute(1.0));
action->m_maxDuration = duration;
action->m_suspended = 2;
- lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0);
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0);
XBT_OUT();
return action;
}
bool CpuL07::isUsed(){
- return lmm_constraint_used(ptask_maxmin_system, getConstraint());
+ return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
+}
+
+/** @brief take into account changes of speed (either load or max) */
+void CpuL07::onSpeedChange() {
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
+
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_speedPeak * m_speedScale);
+ while ((var = lmm_get_var_from_cnst
+ (getModel()->getMaxminSystem(), getConstraint(), &elem))) {
+ Action *action = static_cast<Action*>(lmm_variable_id(var));
+
+ lmm_update_variable_bound(getModel()->getMaxminSystem(),
+ action->getVariable(),
+ m_speedScale * m_speedPeak);
+ }
+
+ Cpu::onSpeedChange();
}
+
bool LinkL07::isUsed(){
- return lmm_constraint_used(ptask_maxmin_system, getConstraint());
+ return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
}
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_speedEvent) {
- m_speedScale = value;
- lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_speedPeak * m_speedScale);
+ m_speedScale = value;
+ onSpeedChange();
if (tmgr_trace_event_free(event_type))
p_speedEvent = NULL;
} else if (event_type == p_stateEvent) {
if (value > 0)
- setState(SURF_RESOURCE_ON);
+ turnOn();
else
- setState(SURF_RESOURCE_OFF);
+ turnOff();
if (tmgr_trace_event_free(event_type))
p_stateEvent = NULL;
} else {
p_latEvent = NULL;
} else if (event_type == p_stateEvent) {
if (value > 0)
- setState(SURF_RESOURCE_ON);
+ turnOn();
else
- setState(SURF_RESOURCE_OFF);
+ turnOff();
if (tmgr_trace_event_free(event_type))
p_stateEvent = NULL;
} else {
void LinkL07::updateBandwidth(double value, double date)
{
m_bwCurrent = value;
- lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_bwCurrent);
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bwCurrent);
}
void LinkL07::updateLatency(double value, double date)
lmm_element_t elem = NULL;
m_latCurrent = value;
- while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, getConstraint(), &elem))) {
+ while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
action = static_cast<L07Action*>(lmm_variable_id(var));
action->updateBound();
}
double lat_bound = -1.0;
int i, j;
- int hostNb = p_edgeList->size();
+ int hostNb = p_netcardList->size();
for (i = 0; i < hostNb; i++) {
for (j = 0; j < hostNb; j++) {
if (p_communicationAmount[i * hostNb + j] > 0) {
double lat = 0.0;
- routing_platf->getRouteAndLatency((*p_edgeList)[i], (*p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j],
&route, &lat);
lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
if ((m_latency == 0.0) && (m_suspended == 0)) {
if (m_rate < 0)
- lmm_update_variable_bound(ptask_maxmin_system, getVariable(), lat_bound);
+ lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else
- lmm_update_variable_bound(ptask_maxmin_system, getVariable(),
+ lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(),
std::min(m_rate, lat_bound));
}
}
if (action_hook.is_linked())
p_stateSet->erase(p_stateSet->iterator_to(*this));
if (getVariable())
- lmm_variable_free(ptask_maxmin_system, getVariable());
+ lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
delete this;
return 1;
}
return 0;
}
-void L07Action::cancel()
-{
- setState(SURF_ACTION_FAILED);
- return;
-}
-
void L07Action::suspend()
{
XBT_IN("(%p))", this);
if (m_suspended != 2) {
m_suspended = 1;
- lmm_update_variable_weight(ptask_maxmin_system, getVariable(), 0.0);
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
}
XBT_OUT();
}
{
XBT_IN("(%p)", this);
if (m_suspended != 2) {
- lmm_update_variable_weight(ptask_maxmin_system, getVariable(), 1.0);
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 1.0);
m_suspended = 0;
}
XBT_OUT();
}
-bool L07Action::isSuspended()
-{
- return m_suspended == 1;
-}
-
void L07Action::setMaxDuration(double duration)
{ /* FIXME: should inherit */
XBT_IN("(%p,%g)", this, duration);
