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
make the string large enough to avoid buffer overflows
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
786b76c
..
142e0bc
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-10,8
+10,6
@@
#include "xbt/module.h"
#include "mc/mc.h"
#include "surf/surf_resource.h"
#include "xbt/module.h"
#include "mc/mc.h"
#include "surf/surf_resource.h"
-//#include "surf/surf_resource_lmm.h"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
@@
-149,7
+147,7
@@
s_surf_model_description_t surf_network_model_description[] = {
{"Vegas",
"Model using lagrange_solve instead of lmm_solve (experts only)",
surf_network_model_init_Vegas},
{"Vegas",
"Model using lagrange_solve instead of lmm_solve (experts only)",
surf_network_model_init_Vegas},
- {NULL, NULL, NULL
, NULL
} /* this array must be NULL terminated */
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
s_surf_model_description_t surf_cpu_model_description[] = {
};
s_surf_model_description_t surf_cpu_model_description[] = {
@@
-161,18
+159,18
@@
s_surf_model_description_t surf_cpu_model_description[] = {
{"CpuTI",
"Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces",
surf_cpu_model_init_ti},
{"CpuTI",
"Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces",
surf_cpu_model_init_ti},
- {NULL, NULL,
NULL,
NULL} /* this array must be NULL terminated */
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
s_surf_model_description_t surf_workstation_model_description[] = {
{"CLM03",
"Default workstation model, using LV08 and CM02 as network and CPU",
};
s_surf_model_description_t surf_workstation_model_description[] = {
{"CLM03",
"Default workstation model, using LV08 and CM02 as network and CPU",
- surf_workstation_model_init_CLM03
, create_workstations
},
+ surf_workstation_model_init_CLM03},
{"compound",
"Workstation model allowing you to use other network and CPU models",
{"compound",
"Workstation model allowing you to use other network and CPU models",
- surf_workstation_model_init_compound
, create_workstations
},
+ surf_workstation_model_init_compound},
{"ptask_L07", "Workstation model with better parallel task modeling",
{"ptask_L07", "Workstation model with better parallel task modeling",
- surf_workstation_model_init_ptask_L07
, NULL
},
+ surf_workstation_model_init_ptask_L07},
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
@@
-200,7
+198,7
@@
int find_model_description(s_surf_model_description_t * table,
for (i = 1; table[i].name; i++) {
name_list =
xbt_realloc(name_list,
for (i = 1; table[i].name; i++) {
name_list =
xbt_realloc(name_list,
- strlen(name_list) + strlen(table[i].name) +
2
);
+ strlen(name_list) + strlen(table[i].name) +
3
);
strcat(name_list, ", ");
strcat(name_list, table[i].name);
}
strcat(name_list, ", ");
strcat(name_list, table[i].name);
}
@@
-218,7
+216,6
@@
double generic_maxmin_share_resources(xbt_swag_t running_actions,
double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
- xbt_assert(solve, "Give me a real solver function!");
solve(sys);
xbt_swag_foreach(action, running_actions) {
solve(sys);
xbt_swag_foreach(action, running_actions) {
@@
-369,6
+366,7
@@
void surf_exit(void)
xbt_dynar_foreach(model_list, iter, model)
model->model_private->finalize();
xbt_dynar_free(&model_list);
xbt_dynar_foreach(model_list, iter, model)
model->model_private->finalize();
xbt_dynar_free(&model_list);
+ routing_exit();
if (maxmin_system) {
lmm_system_free(maxmin_system);
if (maxmin_system) {
lmm_system_free(maxmin_system);