X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/06bb605c18bd9a9b704b0415d41ab31e02b49839..6604439f3437486f84c0e239f28b162662631127:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index ce50a00284..d200a79691 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -8,21 +8,45 @@ #include "surf_private.h" #include "xbt/module.h" +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, + "Logging specific to SURF (kernel)"); + +typedef struct surf_resource_object { + surf_resource_t resource; +} s_surf_resource_object_t, *surf_resource_object_t; + static double NOW = 0; xbt_dynar_t resource_list = NULL; tmgr_history_t history = NULL; lmm_system_t maxmin_system = NULL; +xbt_dynar_t surf_path = NULL; +const char *surf_action_state_names[6] = { + "SURF_ACTION_READY", + "SURF_ACTION_RUNNING", + "SURF_ACTION_FAILED", + "SURF_ACTION_DONE", + "SURF_ACTION_TO_FREE", + "SURF_ACTION_NOT_IN_THE_SYSTEM" +}; double generic_maxmin_share_resources(xbt_swag_t running_actions, - size_t offset) + size_t offset) +{ + return generic_maxmin_share_resources2(running_actions, offset, + maxmin_system); +} + +double generic_maxmin_share_resources2(xbt_swag_t running_actions, + size_t offset, + lmm_system_t sys) { surf_action_t action = NULL; double min = -1; double value = -1; #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) - lmm_solve(maxmin_system); + lmm_solve(sys); xbt_swag_foreach(action, running_actions) { value = lmm_variable_getvalue(VARIABLE(action)); @@ -34,7 +58,7 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, return -1.0; if (value > 0) { - min = value = action->remains / value; + min = action->remains / value; if ((action->max_duration >= 0) && (action->max_duration < min)) min = action->max_duration; } else @@ -76,7 +100,7 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action) void surf_action_free(surf_action_t * action) { (*action)->resource_type->common_public->action_cancel(*action); - xbt_free(*action); + free(*action); *action = NULL; } @@ -85,7 +109,7 @@ void surf_action_change_state(surf_action_t action, { surf_action_state_t action_state = &(action->resource_type->common_public->states); - + XBT_IN2("(%p,%s)", action, surf_action_state_names[state]); xbt_swag_remove(action, action->state_set); if (state == SURF_ACTION_READY) @@ -101,6 +125,7 @@ void surf_action_change_state(surf_action_t action, if (action->state_set) xbt_swag_insert(action, action->state_set); + XBT_OUT; } void surf_action_set_data(surf_action_t action, @@ -111,7 +136,30 @@ void surf_action_set_data(surf_action_t action, void surf_init(int *argc, char **argv) { + int i,j; + char *opt; + xbt_init(argc, argv); + if (!surf_path) { + const char *initial_path = "./"; + surf_path = xbt_dynar_new(sizeof(char*), NULL); + xbt_dynar_push(surf_path,&initial_path); + + for (i=1; i<*argc; i++) { + if (!strncmp(argv[i],"--surf-path=",strlen("--surf-path="))) { + opt=strchr(argv[i],'='); + opt++; + xbt_dynar_push(surf_path,&opt); + /*remove this from argv*/ + for (j=i+1; j<*argc; j++) { + argv[j-1] = argv[j]; + } + argv[j-1] = NULL; + (*argc)--; + i--; /* compensate effect of next loop incrementation */ + } + } + } if (!resource_list) resource_list = xbt_dynar_new(sizeof(surf_resource_private_t), NULL); if (!history) @@ -120,7 +168,42 @@ void surf_init(int *argc, char **argv) maxmin_system = lmm_system_new(); } -void surf_finalize(void) +static char* path_name = NULL; +FILE *surf_fopen(const char *name, const char *mode) +{ + int i; + char* path = NULL; + FILE *file = NULL; + int path_name_len = 0; /* don't count '\0' */ + + xbt_assert0(name, "Need a non-NULL file name"); + + xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen"); + + if (name[0] == '/') { /* don't mess with absolute file names */ + return fopen(name,mode); + + } else { /* search relative files in the path */ + + if(!path_name) { + path_name_len = strlen(name); + path_name=xbt_new0(char,path_name_len+1); + } + + xbt_dynar_foreach(surf_path,i,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); + } + sprintf(path_name,"%s/%s",path, name); + file = fopen(path_name,mode); + if (file) return file; + } + } + return file; +} + +void surf_exit(void) { int i; surf_resource_t resource = NULL; @@ -140,8 +223,16 @@ void surf_finalize(void) if (resource_list) xbt_dynar_free(&resource_list); + if(surf_path) + xbt_dynar_free(&surf_path); + tmgr_finalize(); surf_parse_lex_destroy(); + if(path_name) { + free(path_name); + path_name = NULL; + } + xbt_exit(); } double surf_solve(void) @@ -158,6 +249,7 @@ double surf_solve(void) int i; if (first_run) { + DEBUG0("First Run! Let's \"purge\" events and put resources in the right state"); while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { if (next_event_date > NOW) break; @@ -178,20 +270,27 @@ double surf_solve(void) min = -1.0; + DEBUG0("Looking for next action end"); xbt_dynar_foreach(resource_list, i, resource) { resource_next_action_end = resource->common_private->share_resources(NOW); + DEBUG2("Resource [%s] : next action end = %f",resource->common_public->name, + resource_next_action_end); if (((min < 0.0) || (resource_next_action_end < min)) && (resource_next_action_end >= 0.0)) min = resource_next_action_end; } + DEBUG1("Next action end : %f", min); if (min < 0.0) return -1.0; + DEBUG0("Looking for next event"); while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { + DEBUG1("Next event : %f",next_event_date); if (next_event_date > NOW + min) break; + DEBUG0("Updating resources"); while ((event = tmgr_history_get_next_event_leq(history, next_event_date, &value, @@ -199,6 +298,7 @@ double surf_solve(void) if (resource_obj->resource->common_private-> resource_used(resource_obj)) { min = next_event_date - NOW; + DEBUG1("This event will modify resource state. Next event set to %f", min); } /* update state of resource_obj according to new value. Does not touch lmm. It will be modified if needed when updating actions */ @@ -207,6 +307,7 @@ double surf_solve(void) } } + DEBUG1("Duration set to %f", min); xbt_dynar_foreach(resource_list, i, resource) { resource->common_private->update_actions_state(NOW, min);