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);
}
}
e_surf_link_sharing_policy_t policy)
: Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), future_evt_set, 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());
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) {
+ if (triggered == m_bandwidth.event) {
updateBandwidth(value, date);
- tmgr_trace_event_unref(&p_bwEvent);
- } else if (triggered == p_latEvent) {
+ tmgr_trace_event_unref(&m_bandwidth.event);
+ } else if (triggered == m_latency.event) {
updateLatency(value, date);
- tmgr_trace_event_unref(&p_latEvent);
- } else if (triggered == p_stateEvent) {
+ 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)
{
- 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)
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();
~LinkL07(){ };
bool isUsed() override;
void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
- double getBandwidth() override;
void updateBandwidth(double value, double date=surf_get_clock()) override;
void updateLatency(double value, double date=surf_get_clock()) override;
-
- double m_bwCurrent;
- tmgr_trace_iterator_t p_bwEvent;
};
/**********
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- 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) {
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- link->p_speed.event = 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) {
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- 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);
}
}
else
turnOff();
- p_speed.scale = 1.0;
- p_speed.peak = bw_peak;
+ m_bandwidth.scale = 1.0;
+ m_bandwidth.peak = bw_peak;
if (bw_trace)
- p_speed.event = fes->add_trace(bw_trace, 0.0, this);
+ m_bandwidth.event = fes->add_trace(bw_trace, 0.0, this);
else
- p_speed.event = NULL;
+ m_bandwidth.event = NULL;
- m_latCurrent = lat_initial;
+ m_latency.scale = 1.0;
+ m_latency.peak = lat_initial;
if (lat_trace)
- p_latEvent = fes->add_trace(lat_trace, 0.0, this);
+ m_latency.event = fes->add_trace(lat_trace, 0.0, this);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(getConstraint());
{
/* Find out which of my iterators was triggered, and react accordingly */
- if (triggered == p_speed.event) {
+ if (triggered == m_bandwidth.event) {
updateBandwidth(value, date);
- tmgr_trace_event_unref(&p_speed.event);
- } else if (triggered == p_latEvent) {
+ tmgr_trace_event_unref(&m_bandwidth.event);
+ } else if (triggered == m_latency.event) {
updateLatency(value, date);
- tmgr_trace_event_unref(&p_latEvent);
- } else if (triggered == p_stateEvent) {
+ tmgr_trace_event_unref(&m_latency.event);
+ } else if (triggered == m_stateEvent) {
if (value > 0)
turnOn();
else {
}
}
}
- tmgr_trace_event_unref(&p_stateEvent);
+ tmgr_trace_event_unref(&m_stateEvent);
} else {
xbt_die("Unknown event!\n");
}
void NetworkCm02Link::updateBandwidth(double value, double date){
double delta = sg_weight_S_parameter / value - sg_weight_S_parameter /
- (p_speed.peak * p_speed.scale);
+ (m_bandwidth.peak * m_bandwidth.scale);
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
lmm_element_t nextelem = NULL;
NetworkCm02Action *action = NULL;
- p_speed.peak = value;
+ m_bandwidth.peak = value;
lmm_update_constraint_bound(getModel()->getMaxminSystem(),
getConstraint(),
sg_bandwidth_factor *
- (p_speed.peak * p_speed.scale));
- TRACE_surf_link_set_bandwidth(date, getName(), sg_bandwidth_factor * p_speed.peak * p_speed.scale);
+ (m_bandwidth.peak * m_bandwidth.scale));
+ TRACE_surf_link_set_bandwidth(date, getName(), sg_bandwidth_factor * m_bandwidth.peak * m_bandwidth.scale);
if (sg_weight_S_parameter > 0) {
while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) {
action = (NetworkCm02Action*) lmm_variable_id(var);
}
void NetworkCm02Link::updateLatency(double value, double date){
- double delta = value - m_latCurrent;
+ double delta = value - m_latency.peak;
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
lmm_element_t nextelem = NULL;
int numelem = 0;
NetworkCm02Action *action = NULL;
- m_latCurrent = value;
+ m_latency.peak = value;
while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) {
action = (NetworkCm02Action*) lmm_variable_id(var);
action->m_latCurrent += delta;
{
links->insert({name, this});
+ m_latency.scale = 1;
+ m_bandwidth.scale = 1;
XBT_DEBUG("Create link '%s'",name);
}
: Resource(model, name, constraint),
PropertyHolder(props)
{
+ m_latency.scale = 1;
+ m_bandwidth.scale = 1;
if (state_trace)
- p_stateEvent = fes->add_trace(state_trace, 0.0, this);
+ m_stateEvent = fes->add_trace(state_trace, 0.0, this);
links->insert({name, this});
XBT_DEBUG("Create link '%s'",name);
double Link::getLatency()
{
- return m_latCurrent;
+ return m_latency.peak * m_latency.scale;
}
double Link::getBandwidth()
{
- return p_speed.peak * p_speed.scale;
+ return m_bandwidth.peak * m_bandwidth.scale;
}
int Link::sharingPolicy()
void turnOn() override;
void turnOff() override;
- /* Using this object with the public part of
- model does not make sense */
- double m_latCurrent = 0;
- tmgr_trace_iterator_t p_latEvent = NULL;
-
- /* LMM */
- tmgr_trace_iterator_t p_stateEvent = NULL;
- s_surf_metric_t p_speed;
+ tmgr_trace_iterator_t m_stateEvent = NULL;
+ s_surf_metric_t m_latency = {1.0,0,NULL};
+ s_surf_metric_t m_bandwidth = {1.0,0,NULL};
/* User data */
public:
: Link(model, name, props)
, m_created(1)
{
- p_speed.scale = 1.0;
- p_speed.peak = bw_initial;
- m_latCurrent = lat_initial;
+ m_bandwidth.peak = bw_initial;
+ m_latency.peak = lat_initial;
}
NetworkNS3Link::~NetworkNS3Link()