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
objectifies the Future Event Set of trace events
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index
5163c8c
..
503bf1b
100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-29,7
+29,9
@@
void net_define_callbacks(void)
{
/* Figuring out the network links */
simgrid::surf::on_link.connect(netlink_parse_init);
- simgrid::surf::on_postparse.connect(net_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_network_model->addTraces();
+ });
}
/*********
@@
-207,7
+209,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,
history
,
+ Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial,
future_evt_set
,
initiallyOn, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy);
Link::onCreation(link);
return link;
@@
-477,7
+479,7
@@
void NetworkCm02Model::addTraces(){
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- link->p_stateEvent =
tmgr_history_add_trace(history,
trace, 0.0, 0, link);
+ link->p_stateEvent =
future_evt_set->add_trace(
trace, 0.0, 0, link);
}
xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
@@
-490,7
+492,7
@@
void NetworkCm02Model::addTraces(){
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- link->p_speed.event =
tmgr_history_add_trace(history,
trace, 0.0, 0, link);
+ link->p_speed.event =
future_evt_set->add_trace(
trace, 0.0, 0, link);
}
xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
@@
-503,7
+505,7
@@
void NetworkCm02Model::addTraces(){
"Cannot connect trace %s to link %s: trace undefined",
trace_name, elm);
- link->p_latEvent =
tmgr_history_add_trace(history,
trace, 0.0, 0, link);
+ link->p_latEvent =
future_evt_set->add_trace(
trace, 0.0, 0, link);
}
}
@@
-513,7
+515,7
@@
void NetworkCm02Model::addTraces(){
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
lmm_system_t system,
double constraint_value,
-
tmgr_history_t history
,
+
sg_future_evt_set_t fes
,
int initiallyOn,
tmgr_trace_t state_trace,
double metric_peak,
@@
-521,7
+523,7
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
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),
history
, state_trace)
+: Link(model, name, props, lmm_constraint_new(system, this, constraint_value),
fes
, state_trace)
{
if (initiallyOn)
turnOn();
@@
-531,13
+533,13
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
p_speed.scale = 1.0;
p_speed.peak = metric_peak;
if (metric_trace)
- p_speed.event =
tmgr_history_add_trace(history,
metric_trace, 0.0, 0, this);
+ p_speed.event =
fes->add_trace(
metric_trace, 0.0, 0, this);
else
p_speed.event = NULL;
m_latCurrent = lat_initial;
if (lat_trace)
- p_latEvent =
tmgr_history_add_trace(history,
lat_trace, 0.0, 0, this);
+ p_latEvent =
fes->add_trace(
lat_trace, 0.0, 0, this);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(getConstraint());
@@
-545,22
+547,20
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
-void NetworkCm02Link::updateState(tmgr_trace_
event_t event_type
,
+void NetworkCm02Link::updateState(tmgr_trace_
iterator_t triggered
,
double value, double date)
{
- /* printf("[" "%g" "] Asking to update network card \"%s\" with value " */
- /* "%g" " for event %p\n", surf_get_clock(), nw_link->name, */
- /* value, event_type); */
- if (event_type == p_speed.event) {
+ /* Find out which of my iterators was triggered, and react accordingly */
+ if (triggered == p_speed.event) {
updateBandwidth(value, date);
- if (tmgr_trace_event_free(
event_type
))
+ if (tmgr_trace_event_free(
triggered
))
p_speed.event = NULL;
- } else if (
event_type
== p_latEvent) {
+ } else if (
triggered
== p_latEvent) {
updateLatency(value, date);
- if (tmgr_trace_event_free(
event_type
))
+ if (tmgr_trace_event_free(
triggered
))
p_latEvent = NULL;
- } else if (
event_type
== p_stateEvent) {
+ } else if (
triggered
== p_stateEvent) {
if (value > 0)
turnOn();
else {
@@
-579,7
+579,7
@@
void NetworkCm02Link::updateState(tmgr_trace_event_t event_type,
}
}
}
- if (tmgr_trace_event_free(
event_type
))
+ if (tmgr_trace_event_free(
triggered
))
p_stateEvent = NULL;
} else {
XBT_CRITICAL("Unknown event ! \n");