X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/686dec33de79ebdb24cfc595fd679b63b466bc77..f4d1afaaa1e4fee55a98707443c05bdbc9abb42c:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index c5012a408c..346c22e97f 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -5,41 +5,209 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "surf_private.h" #include "xbt/module.h" +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, + "Logging specific to SURF (kernel)"); + +int use_sdp_solver = 0; +int use_lagrange_solver = 0; + +/* Additional declarations for Windows potability. */ + +#ifndef MAX_DRIVE +#define MAX_DRIVE 26 +#endif + +#ifdef _WIN32 +#include +static const char *disk_drives_letter_table[MAX_DRIVE] = { + "A:\\", + "B:\\", + "C:\\", + "D:\\", + "E:\\", + "F:\\", + "G:\\", + "H:\\", + "I:\\", + "J:\\", + "K:\\", + "L:\\", + "M:\\", + "N:\\", + "O:\\", + "P:\\", + "Q:\\", + "R:\\", + "S:\\", + "T:\\", + "U:\\", + "V:\\", + "W:\\", + "X:\\", + "Y:\\", + "Z:\\" +}; +#endif /* #ifdef _WIN32 */ + +/* + * Returns the initial path. On Windows the initial path is + * the current directory for the current process in the other + * case the function returns "./" that represents the current + * directory on Unix/Linux platforms. + */ + +const char *__surf_get_initial_path(void) +{ + +#ifdef _WIN32 + unsigned i; + char current_directory[MAX_PATH + 1] = { 0 }; + unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); + char root[4] = { 0 }; + + if (!len) + return NULL; + + strncpy(root, current_directory, 3); + + for (i = 0; i < MAX_DRIVE; i++) { + if (toupper(root[0]) == disk_drives_letter_table[i][0]) + return disk_drives_letter_table[i]; + } + + return NULL; +#else + return "./"; +#endif +} + +/* The __surf_is_absolute_file_path() returns 1 if + * file_path is a absolute file path, in the other + * case the function returns 0. + */ +int __surf_is_absolute_file_path(const char *file_path) +{ +#ifdef _WIN32 + WIN32_FIND_DATA wfd = { 0 }; + HANDLE hFile = FindFirstFile(file_path, &wfd); + + if (INVALID_HANDLE_VALUE == hFile) + return 0; + + FindClose(hFile); + return 1; +#else + return (file_path[0] == '/'); +#endif +} + typedef struct surf_resource_object { surf_resource_t resource; } s_surf_resource_object_t, *surf_resource_object_t; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf, - "Logging specific to the SURF global module"); - - 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" +}; + +int surf_network_resource_description_size = 3 +#ifdef HAVE_GTNETS + + 1 +#endif +#ifdef HAVE_SDP + + 1 +#endif + ; +s_surf_resource_description_t surf_network_resource_description[] = { + {"CM02", NULL, surf_network_resource_init_CM02}, +#ifdef HAVE_GTNETS + {"GTNets", NULL, surf_network_resource_init_GTNETS}, +#endif +#ifdef HAVE_SDP + {"SDP", NULL, surf_network_resource_init_SDP}, +#endif + {"Reno", NULL, surf_network_resource_init_Reno}, + {"Vegas", NULL, surf_network_resource_init_Vegas} +}; + +int surf_cpu_resource_description_size = 1; +s_surf_resource_description_t surf_cpu_resource_description[] = { + {"Cas01", NULL, surf_cpu_resource_init_Cas01}, +}; + +int surf_workstation_resource_description_size = 4; +s_surf_resource_description_t surf_workstation_resource_description[] = { + {"CLM03", NULL, surf_workstation_resource_init_CLM03}, + {"KCCFLN05", NULL, surf_workstation_resource_init_KCCFLN05}, + {"compound", NULL, surf_workstation_resource_init_compound}, + {"ptask_L07", NULL, surf_workstation_resource_init_ptask_L07} +}; + +void update_resource_description(s_surf_resource_description_t * table, + int table_size, + const char *name, + surf_resource_t resource) +{ + int i = find_resource_description(table, table_size, name); + table[i].resource = resource; +} + +int find_resource_description(s_surf_resource_description_t * table, + int table_size, const char *name) +{ + int i; + char *name_list = NULL; + + for (i = 0; i < table_size; i++) + if (!strcmp(name, table[i].name)) { + return i; + } + name_list = strdup(table[0].name); + for (i = 1; i < table_size; i++) { + name_list = + xbt_realloc(name_list, + strlen(name_list) + strlen(table[i].name) + 2); + strcat(name_list, ", "); + strcat(name_list, table[i].name); + } + xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name, + name_list); +} 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); + return generic_maxmin_share_resources2(running_actions, offset, + maxmin_system, lmm_solve); } double generic_maxmin_share_resources2(xbt_swag_t running_actions, size_t offset, - lmm_system_t sys) + lmm_system_t sys, + void (*solve) (lmm_system_t)) { surf_action_t action = NULL; double min = -1; double value = -1; #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) - lmm_solve(sys); + xbt_assert0(solve, "Give me a real solver function!"); + solve(sys); xbt_swag_foreach(action, running_actions) { value = lmm_variable_getvalue(VARIABLE(action)); @@ -51,12 +219,14 @@ double generic_maxmin_share_resources2(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 min = action->max_duration; + DEBUG5("Found action (%p: duration = %f, remains = %f, value = %f) ! %f", + action, action->max_duration, action->remains, value, min); for (action = xbt_swag_getNext(action, running_actions->offset); action; @@ -64,12 +234,18 @@ double generic_maxmin_share_resources2(xbt_swag_t running_actions, value = lmm_variable_getvalue(VARIABLE(action)); if (value > 0) { value = action->remains / value; - if (value < min) + if (value < min) { min = value; + DEBUG2("Updating min (value) with %p: %f", action, min); + } } - if ((action->max_duration >= 0) && (action->max_duration < min)) + if ((action->max_duration >= 0) && (action->max_duration < min)) { min = action->max_duration; + DEBUG2("Updating min (duration) with %p: %f", action, min); + } } + DEBUG1("min value : %f", min); + #undef VARIABLE return min; } @@ -90,6 +266,16 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action) return SURF_ACTION_NOT_IN_THE_SYSTEM; } +double surf_action_get_start_time(surf_action_t action) +{ + return action->start; +} + +double surf_action_get_finish_time(surf_action_t action) +{ + return action->finish; +} + void surf_action_free(surf_action_t * action) { (*action)->resource_type->common_public->action_cancel(*action); @@ -102,7 +288,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) @@ -118,37 +304,45 @@ 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, - void *data) +void surf_action_set_data(surf_action_t action, void *data) { - action->data=data; + action->data = data; } void surf_init(int *argc, char **argv) { - int i,j; + int i, j; char *opt; + const char *initial_path; + 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],'='); + /* retrieves the current directory of the current process */ + initial_path = __surf_get_initial_path(); + + xbt_assert0((initial_path), + "__surf_get_initial_path() failed! Can't resolves current Windows directory"); + + 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; + 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 */ + i--; /* compensate effect of next loop incrementation */ } } } @@ -160,42 +354,44 @@ void surf_init(int *argc, char **argv) maxmin_system = lmm_system_new(); } -static char* path_name = NULL; +static char *path_name = NULL; FILE *surf_fopen(const char *name, const char *mode) { - int i; - char* path = NULL; + int i; + char *path = NULL; FILE *file = NULL; - int path_name_len = 0; /* don't count '\0' */ + 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_assert0(surf_path, + "surf_init has to be called before using surf_fopen"); + + if (__surf_is_absolute_file_path(name)) { /* 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); + 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; + sprintf(path_name, "%s/%s", path, name); + file = fopen(path_name, mode); + if (file) + return file; } } return file; } -void surf_finalize(void) +void surf_exit(void) { int i; surf_resource_t resource = NULL; @@ -215,15 +411,16 @@ void surf_finalize(void) if (resource_list) xbt_dynar_free(&resource_list); - if(surf_path) + if (surf_path) xbt_dynar_free(&surf_path); tmgr_finalize(); surf_parse_lex_destroy(); - if(path_name) { + if (path_name) { free(path_name); path_name = NULL; } + xbt_exit(); } double surf_solve(void) @@ -240,6 +437,8 @@ 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; @@ -260,20 +459,28 @@ double surf_solve(void) min = -1.0; + DEBUG0("Looking for next action end"); xbt_dynar_foreach(resource_list, i, resource) { + DEBUG1("Running for Resource [%s]", resource->common_public->name); 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, @@ -281,6 +488,9 @@ 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 */ @@ -289,13 +499,14 @@ double surf_solve(void) } } + DEBUG1("Duration set to %f", min); + + NOW = NOW + min; xbt_dynar_foreach(resource_list, i, resource) { resource->common_private->update_actions_state(NOW, min); } - NOW = NOW + min; - return min; }