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
Enable clobbered variable warnings again and fix the last one (for me)
[simgrid.git]
/
src
/
surf
/
network_im.c
diff --git
a/src/surf/network_im.c
b/src/surf/network_im.c
index
90097df
..
668c2f2
100644
(file)
--- a/
src/surf/network_im.c
+++ b/
src/surf/network_im.c
@@
-263,7
+263,7
@@
static void im_net_add_traces(void)
}
}
}
}
-static void im_net_define_callbacks(
const char *file
)
+static void im_net_define_callbacks(
void
)
{
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init);
{
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init);
@@
-377,7
+377,9
@@
static double im_net_share_resources(double now)
XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
update_action_remaining(now);
XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
update_action_remaining(now);
+ keep_track = im_net_modified_set;
lmm_solve(network_im_maxmin_system);
lmm_solve(network_im_maxmin_system);
+ keep_track = NULL;
XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
@@
-874,7
+876,6
@@
static void im_surf_network_model_init_internal(void)
im_net_get_link_latency);
im_net_modified_set =
xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
im_net_get_link_latency);
im_net_modified_set =
xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
- keep_track = im_net_modified_set;
}
}
@@
-882,13
+883,13
@@
static void im_surf_network_model_init_internal(void)
/************************************************************************/
/* New model based on optimizations discussed during this thesis */
/************************************************************************/
/************************************************************************/
/* New model based on optimizations discussed during this thesis */
/************************************************************************/
-void im_surf_network_model_init_LegrandVelho(
const char *filename
)
+void im_surf_network_model_init_LegrandVelho(
void
)
{
if (surf_network_model)
return;
im_surf_network_model_init_internal();
{
if (surf_network_model)
return;
im_surf_network_model_init_internal();
- im_net_define_callbacks(
filename
);
+ im_net_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
network_im_solve = lmm_solve;
xbt_dynar_push(model_list, &surf_network_model);
network_im_solve = lmm_solve;