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
Delegated constructors are a c++11 feature, avoid them.
[simgrid.git]
/
src
/
surf
/
network.cpp
diff --git
a/src/surf/network.cpp
b/src/surf/network.cpp
index
b1c8981
..
8fa588e
100644
(file)
--- a/
src/surf/network.cpp
+++ b/
src/surf/network.cpp
@@
-109,7
+109,7
@@
static void net_add_traces(void){
}
}
}
}
-
static
void net_define_callbacks(void)
+void net_define_callbacks(void)
{
/* Figuring out the network links */
sg_platf_link_add_cb(net_parse_link_init);
{
/* Figuring out the network links */
sg_platf_link_add_cb(net_parse_link_init);
@@
-248,10
+248,8
@@
void surf_network_model_init_Vegas(void)
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
-NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){
-}
-
-NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
+void NetworkCm02Model::initialize()
+{
ActionLmmPtr comm;
char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
ActionLmmPtr comm;
char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
@@
-276,7
+274,7
@@
NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
if (!p_maxminSystem)
p_maxminSystem = lmm_system_new(m_selectiveUpdate);
if (!p_maxminSystem)
p_maxminSystem = lmm_system_new(m_selectiveUpdate);
- routing_model_create(static_cast<
NetworkCm02Link
Ptr>(createResource("__loopback__",
+ routing_model_create(static_cast<
Resource
Ptr>(createResource("__loopback__",
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL)));
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL)));
@@
-561,8
+559,8
@@
bool NetworkCm02LinkLmm::isShared()
void NetworkCm02LinkLmm::updateState(tmgr_trace_event_t event_type,
double value, double date)
{
void NetworkCm02LinkLmm::updateState(tmgr_trace_event_t event_type,
double value, double date)
{
- /* printf("[" "%
l
g" "] Asking to update network card \"%s\" with value " */
- /* "%
l
g" " for event %p\n", surf_get_clock(), nw_link->name, */
+ /* 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_power.event) {
/* value, event_type); */
if (event_type == p_power.event) {