#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)");
im_surf_network_model_init_LegrandVelho},
{"LV08_fullupdate",
"Realistic network model wit lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) but no further optimization. Should produce the same results as LV08, only slower.",
- surf_network_model_init_LegrandVelho},
+ im_surf_network_model_init_LegrandVelho},
{"SMPI",
"Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
surf_network_model_init_SMPI},
{"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[] = {
{"Cas01_fullupdate", "CPU classical model time=size/power",
- surf_cpu_model_init_Cas01},
+ surf_cpu_model_init_Cas01_im},
{"Cas01",
"Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster",
surf_cpu_model_init_Cas01_im},
{"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",
- surf_workstation_model_init_CLM03, create_workstations},
+ surf_workstation_model_init_CLM03},
{"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",
- surf_workstation_model_init_ptask_L07, NULL},
+ surf_workstation_model_init_ptask_L07},
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
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);
}
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) {
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);