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_interface.cpp
diff --git
a/src/surf/network_interface.cpp
b/src/surf/network_interface.cpp
index
c7a81c5
..
323652b
100644
(file)
--- a/
src/surf/network_interface.cpp
+++ b/
src/surf/network_interface.cpp
@@
-43,8
+43,8
@@
void* sg_link_data(Link *link) {
void sg_link_data_set(Link *link,void *data) {
link->setData(data);
}
void sg_link_data_set(Link *link,void *data) {
link->setData(data);
}
-int sg_link_
am
ount(void) {
- return Link::links
Am
ount();
+int sg_link_
c
ount(void) {
+ return Link::links
C
ount();
}
Link** sg_link_list(void) {
return Link::linksList();
}
Link** sg_link_list(void) {
return Link::linksList();
@@
-72,7
+72,7
@@
Link *Link::byName(const char* name) {
return res;
}
/** @brief Returns the amount of links in the platform */
return res;
}
/** @brief Returns the amount of links in the platform */
-int Link::links
Am
ount() {
+int Link::links
C
ount() {
return links->size();
}
/** @brief Returns a list of all existing links */
return links->size();
}
/** @brief Returns a list of all existing links */
@@
-137,10
+137,6
@@
void netlink_parse_init(sg_platf_link_cbarg_t link){
}
}
}
}
-void net_add_traces(){
- surf_network_model->addTraces();
-}
-
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-205,13
+201,13
@@
Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t prop
Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
-
tmgr_history_t history
,
+
sg_future_evt_set_t fes
,
tmgr_trace_t state_trace)
: Resource(model, name, constraint),
PropertyHolder(props)
{
if (state_trace)
tmgr_trace_t state_trace)
: Resource(model, name, constraint),
PropertyHolder(props)
{
if (state_trace)
- p_stateEvent =
tmgr_history_add_trace(history,
state_trace, 0.0, 0, this);
+ p_stateEvent =
fes->add_trace(
state_trace, 0.0, 0, this);
links->insert({name, this});
XBT_DEBUG("Create link '%s'",name);
links->insert({name, this});
XBT_DEBUG("Create link '%s'",name);