surf_cpu_model_pm = new CpuL07Model(this,p_maxminSystem);
routing_model_create(surf_network_model->createLink("__loopback__",
- 498000000, NULL,
- 0.000015, NULL,
- 1/*ON*/, NULL,
- SURF_LINK_FATPIPE, NULL));
+ 498000000, NULL,
+ 0.000015, NULL,
+ 1/*ON*/, NULL,
+ SURF_LINK_FATPIPE, NULL));
}
HostL07Model::~HostL07Model() {
}
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
- : CpuModel()
- , p_hostModel(hmodel)
- {
- p_maxminSystem = sys;
- }
+ : CpuModel()
+ , p_hostModel(hmodel)
+ {
+ p_maxminSystem = sys;
+ }
CpuL07Model::~CpuL07Model() {
- surf_cpu_model_pm = NULL;
- lmm_system_free(p_maxminSystem);
- p_maxminSystem = NULL;
+ surf_cpu_model_pm = NULL;
+ lmm_system_free(p_maxminSystem);
+ p_maxminSystem = NULL;
}
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
- : NetworkModel()
- , p_hostModel(hmodel)
- {
- p_maxminSystem = sys;
- }
+ : NetworkModel()
+ , p_hostModel(hmodel)
+ {
+ p_maxminSystem = sys;
+ }
NetworkL07Model::~NetworkL07Model()
{
- surf_network_model = NULL;
- p_maxminSystem = NULL; // Avoid multi-free
+ surf_network_model = NULL;
+ p_maxminSystem = NULL; // Avoid multi-free
}
-double HostL07Model::shareResources(double /*now*/)
+double HostL07Model::next_occuring_event(double /*now*/)
{
L07Action *action;
bottleneck_solve);
for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end())
- ; it != itend ; ++it) {
- action = static_cast<L07Action*>(&*it);
+ ; it != itend ; ++it) {
+ action = static_cast<L07Action*>(&*it);
if (action->m_latency > 0) {
if (min < 0) {
min = action->m_latency;
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it = actionSet->begin(), itNext = it
- ; it != actionSet->end()
- ; it = itNext) {
- ++itNext;
+ ; it != actionSet->end()
+ ; it = itNext) {
+ ++itNext;
action = static_cast<L07Action*>(&*it);
if (action->m_latency > 0) {
if (action->m_latency > delta) {
}
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);
+ 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)
+ sg_host_t*host_list,
+ double *flops_amount,
+ double *bytes_amount,
+ double rate)
+ : CpuAction(model, 1, 0)
{
unsigned int cpt;
int nb_link = 0;
xbt_dict_t properties)
{
xbt_assert(!Link::byName(name),
- "Link '%s' declared several times in the platform file.", name);
+ "Link '%s' declared several times in the platform file.", name);
Link* link = new LinkL07(this, name, properties,
- bw_initial, bw_trace,
- lat_initial, lat_trace,
- initiallyOn, state_trace,
- policy);
+ bw_initial, bw_trace,
+ lat_initial, lat_trace,
+ initiallyOn, state_trace,
+ policy);
Link::onCreation(link);
return link;
}
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
- if (!trace_connect_list_host_speed)
+ if (!trace_connect_list_link_avail)
return;
- /* Connect traces relative to cpu */
- xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu;
-
- xbt_assert(cpu, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- cpu->set_speed_trace(trace);
- }
-
/* Connect traces relative to network */
xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
xbt_assert(link, "Link %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
+ link->m_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
}
xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
xbt_assert(link, "Link %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, link);
+ link->m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, link);
}
xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
xbt_assert(link, "Link %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link);
+ link->m_latency.event = future_evt_set->add_trace(trace, 0.0, link);
}
}
************/
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)
+ 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)
+ core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, initiallyOn)
{
p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
if (speedTrace)
- p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this);
+ p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this);
if (state_trace)
p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
}
LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- int initiallyOn,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy)
- : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), future_evt_set, state_trace)
+ double bw_initial, tmgr_trace_t bw_trace,
+ double lat_initial, tmgr_trace_t lat_trace,
+ int initiallyOn, tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t policy)
+ : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), state_trace)
{
- m_bwCurrent = bw_initial;
+ m_bandwidth.peak = bw_initial;
if (bw_trace)
- p_bwEvent = future_evt_set->add_trace(bw_trace, 0.0, this);
+ m_bandwidth.event = future_evt_set->add_trace(bw_trace, 0.0, this);
if (initiallyOn)
turnOn();
else
turnOff();
- m_latCurrent = lat_initial;
+ m_latency.peak = lat_initial;
if (lat_trace)
- p_latEvent = future_evt_set->add_trace(lat_trace, 0.0, this);
+ m_latency.event = future_evt_set->add_trace(lat_trace, 0.0, this);
if (policy == SURF_LINK_FATPIPE)
- lmm_constraint_shared(getConstraint());
+ lmm_constraint_shared(getConstraint());
}
Action *CpuL07::execution_start(double size)
/** @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_variable_t var = NULL;
+ lmm_element_t elem = NULL;
- lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_speedPeak * m_speedScale);
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), p_speed.peak * p_speed.scale);
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);
+ p_speed.scale * p_speed.peak);
}
- Cpu::onSpeedChange();
+ Cpu::onSpeedChange();
}
return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
}
-void CpuL07::updateState(tmgr_trace_iterator_t triggered, double value, double /*date*/){
+void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value);
- if (triggered == p_speedEvent) {
- m_speedScale = value;
+ if (triggered == p_speed.event) {
+ p_speed.scale = value;
onSpeedChange();
- tmgr_trace_event_unref(&p_speedEvent);
+ tmgr_trace_event_unref(&p_speed.event);
} else if (triggered == p_stateEvent) {
if (value > 0)
turnOn();
}
}
-void LinkL07::updateState(tmgr_trace_iterator_t triggered, double value, double date) {
- XBT_DEBUG("Updating link %s (%p) with value=%f for date=%g", getName(), this, value, date);
- if (triggered == p_bwEvent) {
- updateBandwidth(value, date);
- tmgr_trace_event_unref(&p_bwEvent);
- } else if (triggered == p_latEvent) {
- updateLatency(value, date);
- tmgr_trace_event_unref(&p_latEvent);
- } else if (triggered == p_stateEvent) {
+void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) {
+ XBT_DEBUG("Updating link %s (%p) with value=%f", getName(), this, value);
+ if (triggered == m_bandwidth.event) {
+ updateBandwidth(value);
+ tmgr_trace_event_unref(&m_bandwidth.event);
+ } else if (triggered == m_latency.event) {
+ updateLatency(value);
+ tmgr_trace_event_unref(&m_latency.event);
+ } else if (triggered == m_stateEvent) {
if (value > 0)
turnOn();
else
turnOff();
- tmgr_trace_event_unref(&p_stateEvent);
+ tmgr_trace_event_unref(&m_stateEvent);
} else {
xbt_die("Unknown event ! \n");
}
}
-double LinkL07::getBandwidth()
-{
- return m_bwCurrent;
-}
-
-void LinkL07::updateBandwidth(double value, double date)
+void LinkL07::updateBandwidth(double value)
{
- m_bwCurrent = value;
- lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bwCurrent);
+ m_bandwidth.peak = value;
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bandwidth.peak * m_bandwidth.scale);
}
-void LinkL07::updateLatency(double value, double date)
+void LinkL07::updateLatency(double value)
{
lmm_variable_t var = NULL;
L07Action *action;
lmm_element_t elem = NULL;
- m_latCurrent = value;
+ m_latency.peak = value;
while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
action = static_cast<L07Action*>(lmm_variable_id(var));
action->updateBound();