A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
remove the last remainings of the addTraces() pimple \o/
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index
2e503cc
..
1f2794f
100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-29,9
+29,6
@@
void net_define_callbacks(void)
{
/* Figuring out the network links */
simgrid::surf::on_link.connect(netlink_parse_init);
- simgrid::surf::on_postparse.connect([]() {
- surf_network_model->addTraces();
- });
}
/*********
@@
-170,10
+167,7
@@
NetworkCm02Model::NetworkCm02Model()
} else if (!strcmp(optim, "Lazy")) {
p_updateMechanism = UM_LAZY;
m_selectiveUpdate = 1;
- xbt_assert((select == 1)
- ||
- (xbt_cfg_is_default_value
- (_sg_cfg_set, "network/maxmin_selective_update")),
+ xbt_assert((select == 1) || (xbt_cfg_is_default_value(_sg_cfg_set, "network/maxmin_selective_update")),
"Disabling selective update while using the lazy update mechanism is dumb!");
} else {
xbt_die("Unsupported optimization (%s) for this model", optim);
@@
-209,7
+203,7
@@
Link* NetworkCm02Model::createLink(const char *name,
"Link '%s' declared several times in the platform",
name);
- Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial,
future_evt_set,
+ Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial,
initiallyOn, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy);
Link::onCreation(link);
return link;
@@
-460,84
+454,34
@@
Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
return action;
}
-void NetworkCm02Model::addTraces(){
- xbt_dict_cursor_t cursor = NULL;
- char *trace_name, *elm;
-
- static int called = 0;
- if (called)
- return;
- called = 1;
-
- /* connect all 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);
- NetworkCm02Link *link = static_cast<NetworkCm02Link*>( Link::byName(elm) );
-
- xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
- trace_name, elm);
- xbt_assert(trace,
- "Cannot connect trace %s to link %s: trace undefined",
- trace_name, elm);
-
- link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
- }
-
- xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- NetworkCm02Link *link = static_cast<NetworkCm02Link*>( Link::byName(elm) );
-
- xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
- trace_name, elm);
- xbt_assert(trace,
- "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);
- }
-
- xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- NetworkCm02Link *link = static_cast<NetworkCm02Link*>(Link::byName(elm));;
-
- xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
- trace_name, elm);
- xbt_assert(trace,
- "Cannot connect trace %s to link %s: trace undefined",
- trace_name, elm);
-
- link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link);
- }
-}
-
/************
* Resource *
************/
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
lmm_system_t system,
double constraint_value,
- sg_future_evt_set_t fes,
int initiallyOn, tmgr_trace_t state_trace,
double bw_peak, tmgr_trace_t bw_trace,
double lat_initial, tmgr_trace_t lat_trace,
e_surf_link_sharing_policy_t policy)
-: Link(model, name, props, lmm_constraint_new(system, this, constraint_value),
fes,
state_trace)
+: Link(model, name, props, lmm_constraint_new(system, this, constraint_value), state_trace)
{
if (initiallyOn)
turnOn();
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 = future_evt_set
->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 = future_evt_set
->add_trace(lat_trace, 0.0, this);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(getConstraint());
@@
-545,23
+489,23
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
-void NetworkCm02Link::updateState(tmgr_trace_iterator_t triggered,
- double value, double date)
+void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value)
{
/* Find out which of my iterators was triggered, and react accordingly */
- if (triggered ==
p_speed
.event) {
- updateBandwidth(value
, date
);
- tmgr_trace_event_unref(&
p_speed
.event);
- } else if (triggered ==
p_latE
vent) {
- updateLatency(value
, date
);
- tmgr_trace_event_unref(&
p_latE
vent);
- } else if (triggered ==
p
_stateEvent) {
+ if (triggered ==
m_bandwidth
.event) {
+ updateBandwidth(value);
+ tmgr_trace_event_unref(&
m_bandwidth
.event);
+ } else if (triggered ==
m_latency.e
vent) {
+ updateLatency(value);
+ tmgr_trace_event_unref(&
m_latency.e
vent);
+ } else if (triggered ==
m
_stateEvent) {
if (value > 0)
turnOn();
else {
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
+ double now = surf_get_clock();
turnOff();
while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
@@
-569,12
+513,12
@@
void NetworkCm02Link::updateState(tmgr_trace_iterator_t triggered,
if (action->getState() == SURF_ACTION_RUNNING ||
action->getState() == SURF_ACTION_READY) {
- action->setFinishTime(
date
);
+ action->setFinishTime(
now
);
action->setState(SURF_ACTION_FAILED);
}
}
}
- tmgr_trace_event_unref(&
p
_stateEvent);
+ tmgr_trace_event_unref(&
m
_stateEvent);
} else {
xbt_die("Unknown event!\n");
}
@@
-584,9
+528,9
@@
void NetworkCm02Link::updateState(tmgr_trace_iterator_t triggered,
getConstraint());
}
-void NetworkCm02Link::updateBandwidth(double value
, double date)
{
+void NetworkCm02Link::updateBandwidth(double value
)
{
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;
@@
-594,12
+538,12
@@
void NetworkCm02Link::updateBandwidth(double value, double date){
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(
surf_get_clock(), 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);
@@
-610,15
+554,15
@@
void NetworkCm02Link::updateBandwidth(double value, double date){
}
}
-void NetworkCm02Link::updateLatency(double value
, double date
){
- double delta = value - m_lat
Current
;
+void NetworkCm02Link::updateLatency(double value){
+ double delta = value - m_lat
ency.peak
;
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
lmm_element_t nextelem = NULL;
int numelem = 0;
NetworkCm02Action *action = NULL;
- m_lat
Current
= value;
+ m_lat
ency.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;