X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..148f5e8e381d67771e1b389f6ee068d25482b2f7:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index f80dadd0dd..016ab2a2e2 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -125,15 +125,7 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -int surf_network_model_description_size = 3 -#ifdef HAVE_GTNETS - + 1 -#endif -#ifdef HAVE_SDP - + 1 -#endif - ; -s_surf_model_description_t surf_network_model_description[] = { +s_surf_model_description_t surf_network_model_description[surf_network_model_description_size] = { {"CM02", NULL, surf_network_model_init_CM02}, #ifdef HAVE_GTNETS {"GTNets", NULL, surf_network_model_init_GTNETS}, @@ -145,17 +137,14 @@ s_surf_model_description_t surf_network_model_description[] = { {"Vegas", NULL, surf_network_model_init_Vegas} }; -int surf_cpu_model_description_size = 1; -s_surf_model_description_t surf_cpu_model_description[] = { +s_surf_model_description_t surf_cpu_model_description[surf_cpu_model_description_size] = { {"Cas01", NULL, surf_cpu_model_init_Cas01}, }; -int surf_workstation_model_description_size = 4; -s_surf_model_description_t surf_workstation_model_description[] = { - {"CLM03", NULL, surf_workstation_model_init_CLM03}, - {"KCCFLN05", NULL, surf_workstation_model_init_KCCFLN05}, - {"compound", NULL, surf_workstation_model_init_compound}, - {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07} +s_surf_model_description_t surf_workstation_model_description[surf_workstation_model_description_size] = { + {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations}, + {"compound", NULL, surf_workstation_model_init_compound, create_workstations}, + {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL} }; void update_model_description(s_surf_model_description_t * table, @@ -189,17 +178,10 @@ int find_model_description(s_surf_model_description_t * table, name_list); } -double generic_maxmin_share_models(xbt_swag_t running_actions, - size_t offset) -{ - return generic_maxmin_share_models2(running_actions, offset, - maxmin_system, lmm_solve); -} - -double generic_maxmin_share_models2(xbt_swag_t running_actions, - size_t offset, - lmm_system_t sys, - void (*solve) (lmm_system_t)) +double generic_maxmin_share_resources(xbt_swag_t running_actions, + size_t offset, + lmm_system_t sys, + void (*solve) (lmm_system_t)) { surf_action_t action = NULL; double min = -1; @@ -318,6 +300,24 @@ void surf_action_set_data(surf_action_t action, void *data) action->data = data; } +XBT_LOG_EXTERNAL_CATEGORY(surf_cpu); +XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); +XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange); +XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy); +XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin); +XBT_LOG_EXTERNAL_CATEGORY(surf_network); +XBT_LOG_EXTERNAL_CATEGORY(surf_parse); +XBT_LOG_EXTERNAL_CATEGORY(surf_timer); +XBT_LOG_EXTERNAL_CATEGORY(surf_workstation); + +#ifdef HAVE_SDP + XBT_LOG_EXTERNAL_CATEGORY(surf_sdp_out); + XBT_LOG_EXTERNAL_CATEGORY(surf_sdp); +#endif +#ifdef HAVE_GTNETS + XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets); +#endif + void surf_init(int *argc, char **argv) { int i, j; @@ -325,6 +325,25 @@ void surf_init(int *argc, char **argv) const char *initial_path; + /* Connect our log channels: that must be done manually under windows */ + XBT_LOG_CONNECT(surf_cpu, surf); + XBT_LOG_CONNECT(surf_kernel, surf); + XBT_LOG_CONNECT(surf_lagrange, surf); + XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange); + XBT_LOG_CONNECT(surf_maxmin, surf); + XBT_LOG_CONNECT(surf_network, surf); + XBT_LOG_CONNECT(surf_parse, surf); + XBT_LOG_CONNECT(surf_timer, surf); + XBT_LOG_CONNECT(surf_workstation, surf); + +#ifdef HAVE_SDP + XBT_LOG_CONNECT(surf_sdp_out, surf); + XBT_LOG_CONNECT(surf_sdp, surf); +#endif +#ifdef HAVE_GTNETS + XBT_LOG_CONNECT(surf_network_gtnets, surf); +#endif + xbt_init(argc, argv); if (!surf_path) { @@ -356,17 +375,15 @@ void surf_init(int *argc, char **argv) model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL); if (!history) history = tmgr_history_new(); - if (!maxmin_system) - maxmin_system = lmm_system_new(); } static char *path_name = NULL; FILE *surf_fopen(const char *name, const char *mode) { - int i; + unsigned int iter; char *path = NULL; FILE *file = NULL; - int path_name_len = 0; /* don't count '\0' */ + unsigned int path_name_len = 0; /* don't count '\0' */ xbt_assert0(name, "Need a non-NULL file name"); @@ -383,12 +400,16 @@ FILE *surf_fopen(const char *name, const char *mode) path_name = xbt_new0(char, path_name_len + 1); } - xbt_dynar_foreach(surf_path, i, path) { + xbt_dynar_foreach(surf_path, iter, path) { if (path_name_len < strlen(path) + strlen(name) + 1) { path_name_len = strlen(path) + strlen(name) + 1; /* plus '/' */ path_name = xbt_realloc(path_name, path_name_len + 1); } + #ifdef WIN32 + sprintf(path_name, "%s\\%s", path, name); + #else sprintf(path_name, "%s/%s", path, name); + #endif file = fopen(path_name, mode); if (file) return file; @@ -399,10 +420,10 @@ FILE *surf_fopen(const char *name, const char *mode) void surf_exit(void) { - int i; + unsigned int iter; surf_model_t model = NULL; - xbt_dynar_foreach(model_list, i, model) { + xbt_dynar_foreach(model_list, iter, model) { model->common_private->finalize(); } @@ -426,6 +447,9 @@ void surf_exit(void) free(path_name); path_name = NULL; } + surf_parse_free_callbacks(); + xbt_dict_free(&route_table); + NOW=0; /* Just in case the user plans to restart the simulation afterward */ xbt_exit(); } @@ -440,7 +464,7 @@ double surf_solve(void) surf_model_object_t model_obj = NULL; surf_model_t model = NULL; tmgr_trace_event_t event = NULL; - int i; + unsigned int iter; if (first_run) { DEBUG0 @@ -453,10 +477,10 @@ double surf_solve(void) &value, (void **) &model_obj))) { model_obj->model->common_private-> - update_model_state(model_obj, event, value); + update_resource_state(model_obj, event, value); } } - xbt_dynar_foreach(model_list, i, model) { + xbt_dynar_foreach(model_list, iter, model) { model->common_private->update_actions_state(NOW, 0.0); } first_run = 0; @@ -466,10 +490,10 @@ double surf_solve(void) min = -1.0; DEBUG0("Looking for next action end"); - xbt_dynar_foreach(model_list, i, model) { + xbt_dynar_foreach(model_list, iter, model) { DEBUG1("Running for Resource [%s]", model->common_public->name); model_next_action_end = - model->common_private->share_models(NOW); + model->common_private->share_resources(NOW); DEBUG2("Resource [%s] : next action end = %f", model->common_public->name, model_next_action_end); if (((min < 0.0) || (model_next_action_end < min)) @@ -492,7 +516,7 @@ double surf_solve(void) &value, (void **) &model_obj))) { if (model_obj->model->common_private-> - model_used(model_obj)) { + resource_used(model_obj)) { min = next_event_date - NOW; DEBUG1 ("This event will modify model state. Next event set to %f", @@ -501,7 +525,7 @@ double surf_solve(void) /* update state of model_obj according to new value. Does not touch lmm. It will be modified if needed when updating actions */ model_obj->model->common_private-> - update_model_state(model_obj, event, value); + update_resource_state(model_obj, event, value); } } @@ -509,7 +533,7 @@ double surf_solve(void) NOW = NOW + min; - xbt_dynar_foreach(model_list, i, model) { + xbt_dynar_foreach(model_list, iter, model) { model->common_private->update_actions_state(NOW, min); }