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
rename the datacontainers allowing the trace:connect tag
[simgrid.git]
/
src
/
surf
/
surf_routing.hpp
diff --git
a/src/surf/surf_routing.hpp
b/src/surf/surf_routing.hpp
index
7fdd860
..
c380129
100644
(file)
--- a/
src/surf/surf_routing.hpp
+++ b/
src/surf/surf_routing.hpp
@@
-48,15
+48,15
@@
public:
*/
class As {
public:
*/
class As {
public:
- xbt_dynar_t p_indexNetworkElm;
+ xbt_dynar_t p_indexNetworkElm
= xbt_dynar_new(sizeof(char*),NULL)
;
xbt_dict_t p_bypassRoutes; /* store bypass routes */
routing_model_description_t p_modelDesc;
e_surf_routing_hierarchy_t p_hierarchy;
xbt_dict_t p_bypassRoutes; /* store bypass routes */
routing_model_description_t p_modelDesc;
e_surf_routing_hierarchy_t p_hierarchy;
- char *p_name;
- As *p_routingFather;
- xbt_dict_t p_routingSons;
- NetCard *p_net
Elem
;
- xbt_dynar_t p_linkUpDownList;
+ char *p_name
= nullptr
;
+ As *p_routingFather
= nullptr
;
+ xbt_dict_t p_routingSons
= xbt_dict_new_homogeneous(NULL)
;
+ NetCard *p_net
card
;
+ xbt_dynar_t p_linkUpDownList
= NULL
;
/**
* @brief The As constructor
/**
* @brief The As constructor
@@
-67,9
+67,12
@@
public:
* @brief The As destructor
*/
virtual ~As(){
* @brief The As destructor
*/
virtual ~As(){
- xbt_free(p_name);
- if (p_netElem)
- delete p_netElem;
+ xbt_dict_free(&p_routingSons);
+ xbt_dynar_free(&p_indexNetworkElm);
+ xbt_dynar_free(&p_linkUpDownList);
+ xbt_free(p_name);
+ if (p_netcard)
+ delete p_netcard;
};
/**
};
/**
@@
-158,7
+161,7
@@
public:
* Callbacks *
*************/
* Callbacks *
*************/
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>)
routingEdge
CreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>)
netcard
CreatedCallbacks;
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(As*)>) asCreatedCallbacks;
}
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(As*)>) asCreatedCallbacks;
}