X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64475c65e715e134d5a72931863896eb5d43fd32..b03c4669c65ee144f7e3c86c9b6748d0c831931c:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 334fc64afe..ced29d3bed 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -8,16 +8,121 @@ #include "surf_private.h" #include "xbt/module.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf, - "Logging specific to the SURF global module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, + "Logging specific to SURF (kernel)"); +int use_sdp_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 0) { - min = value = action->remains / value; + min = action->remains / value; if ((action->max_duration >= 0) && (action->max_duration < min)) min = action->max_duration; } else @@ -86,6 +199,14 @@ 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); @@ -98,7 +219,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) @@ -114,6 +235,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, @@ -122,21 +244,21 @@ void surf_action_set_data(surf_action_t action, action->data=data; } -/* HACKHACK: msg_global must be set to a sensible value (like NULL) to use the logging mecanisme - * since log_default_appender use xbt_procname which, in SG, is defined in src/msg/m_process.c - * (in RL, xbt_procname is defined in src/gras/Virtu/rl_process.c) - */ -extern void *msg_global; - void surf_init(int *argc, char **argv) { int i,j; char *opt; + + const char* initial_path; xbt_init(argc, argv); - msg_global=NULL; /* see HACKHACK note above */ if (!surf_path) { - const char *initial_path = "./"; + + /* 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); @@ -175,7 +297,7 @@ FILE *surf_fopen(const char *name, const char *mode) xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen"); - if (name[0] == '/') { /* don't mess with absolute file names */ + 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 */ @@ -198,7 +320,7 @@ FILE *surf_fopen(const char *name, const char *mode) return file; } -void surf_finalize(void) +void surf_exit(void) { int i; surf_resource_t resource = NULL; @@ -227,6 +349,7 @@ void surf_finalize(void) free(path_name); path_name = NULL; } + xbt_exit(); } double surf_solve(void) @@ -243,6 +366,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; @@ -263,20 +387,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, @@ -284,6 +415,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 */ @@ -292,13 +424,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; }