X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8806906f6ee71257fe0ddb66c886ad12d23aed9a..945f379f0d3d7f8e923ee114de2e492e1cb5486f:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 02f8d2d173..777eb1c67f 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -16,6 +16,80 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, SIMIX_Global_t simix_global = NULL; /********************************* SIMIX **************************************/ +static void __simix_config_helper(const char *name, ...) { + va_list pa; + va_start(pa,name); + + SIMIX_config(name,pa); + + va_end(pa); +} + +static void simix_cfg_control_set(const char* control_string) { + /* To split the string in commands, and the cursors */ + xbt_dynar_t set_strings; + char *str; + int cpt; + + if (!control_string) + return; + DEBUG1("Parse log settings '%s'",control_string); + + /* split the string, and remove empty entries */ + set_strings=xbt_str_split_quoted(control_string); + + if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */ + xbt_dynar_free(&set_strings); + return; + } + /* Parse each entry and either use it right now (if the category was already + created), or store it for further use */ + xbt_dynar_foreach(set_strings,cpt,str) { + char *control_string,*control_string_sav,*name,*value; + + + control_string = control_string_sav = strdup(str); + control_string += strspn(control_string, " "); + name = control_string; + control_string += strcspn(str, ":"); + value = control_string; + *value=0; + value++; + + xbt_assert1(strlen(name)!=0, "Invalid name for configuration: '%s'",name); + xbt_assert1(strlen(value)!=0, "Invalid value for configuration: '%s'",value); + INFO2("setting '%s' to '%s'",name,value); + + __simix_config_helper(name,value); + + free(control_string_sav); + } + xbt_dynar_free(&set_strings); +} + +static void simix_cfg_init(int *argc,char **argv) { + int i,j; + char *opt; + + for (i=1; i<*argc; i++){ + if (!strncmp(argv[i],"--cfg=",strlen("--cfg="))) { + opt=strchr(argv[i],'='); + opt++; + + simix_cfg_control_set(opt); + DEBUG1("Did apply '%s' as config setting",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 */ + } + } +} /** * \brief Initialize some SIMIX internal data. @@ -29,6 +103,7 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_global) { surf_init(argc, argv); /* Initialize some common structures. Warning, it sets simix_global=NULL */ + simix_cfg_init(argc,argv); simix_global = xbt_new0(s_SIMIX_Global_t,1); @@ -40,42 +115,48 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->create_process_function = NULL; simix_global->kill_process_function = NULL; + simix_global->cleanup_process_function = SIMIX_process_cleanup; } } /* Debug purpose, incomplete */ -void __SIMIX_display_process_status(void) +void SIMIX_display_process_status(void) { smx_process_t process = NULL; xbt_fifo_item_t item = NULL; smx_action_t act; int nbprocess=xbt_swag_size(simix_global->process_list); - INFO1("SIMIX: %d processes are still running, waiting for something.", + INFO1("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ - INFO0("SIMIX: on : ."); + INFO0("Legend of the following listing: \" on : .\""); xbt_swag_foreach(process, simix_global->process_list) { smx_simdata_process_t p_simdata = (smx_simdata_process_t) process->simdata; // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata; - char *who; + char *who, *who2; - asprintf(&who,"SIMIX: %s on %s: %s", + asprintf(&who,"%s on %s: %s", process->name, - p_simdata->host->name, + p_simdata->s_host->name, (process->simdata->blocked)?"[BLOCKED] " :((process->simdata->suspended)?"[SUSPENDED] ":"")); - if (p_simdata->mutex) { - DEBUG1("Block on a mutex: %s", who); - } - else if (p_simdata->cond) { - DEBUG1("Block on a condition: %s", who); - DEBUG0("Waiting actions:"); - xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) { - DEBUG1("\t %s", act->name); - } - } - else DEBUG1("Unknown block status: %s", who); + + if (p_simdata->mutex) { + who2=bprintf("%s Blocked on mutex %p",who,p_simdata->mutex); + free(who); who=who2; + } else if (p_simdata->cond) { + who2=bprintf("%s Blocked on condition %p; Waiting for the following actions:",who,p_simdata->cond); + free(who); who=who2; + xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) { + who2=bprintf("%s '%s'",who,act->name); + free(who); who=who2; + } + } else { + who2=bprintf("%s Blocked in an unknown status (please report this bug)",who); + free(who); who=who2; + } + INFO1("%s.",who); free(who); } } @@ -86,7 +167,7 @@ void __SIMIX_display_process_status(void) static void _XBT_CALL inthandler(int ignored) { INFO0("CTRL-C pressed. Displaying status and bailing out"); - __SIMIX_display_process_status(); + SIMIX_display_process_status(); exit(1); } @@ -121,7 +202,7 @@ void __SIMIX_main(void) xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) { xbt_swag_foreach(process,cond->sleeping) { DEBUG2("\t preparing to wake up %s on %s", - process->name, process->simdata->host->name); + process->name, process->simdata->s_host->name); } SIMIX_cond_broadcast(cond); /* remove conditional from action */ @@ -136,7 +217,7 @@ void __SIMIX_main(void) xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) { xbt_swag_foreach(process,cond->sleeping) { DEBUG2("\t preparing to wake up %s on %s", - process->name, process->simdata->host->name); + process->name, process->simdata->s_host->name); } SIMIX_cond_broadcast(cond); /* remove conditional from action */ @@ -180,7 +261,6 @@ void SIMIX_clean(void) smx_host_t h = NULL; smx_process_t p = NULL; - while((p=xbt_swag_extract(simix_global->process_list))) { SIMIX_process_kill(p); } @@ -238,7 +318,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) while ((process = xbt_swag_extract(simix_global->process_to_run))) { DEBUG2("Scheduling %s on %s", process->name, - process->simdata->host->name); + process->simdata->s_host->name); simix_global->current_process = process; xbt_context_schedule(process->simdata->context); /* fflush(NULL); */ @@ -269,11 +349,11 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) { DEBUG2("got %p %p", fun, arg); if(fun==SIMIX_process_create) { - process_arg_t args = arg; + smx_process_arg_t args = arg; DEBUG2("Launching %s on %s", args->name, args->hostname); process = SIMIX_process_create(args->name, args->code, args->data, args->hostname, - args->argc,args->argv,NULL); + args->argc,args->argv); if(args->kill_time > SIMIX_get_clock()) { surf_timer_resource->extension_public->set(args->kill_time, (void*) &SIMIX_process_kill, @@ -284,7 +364,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) if(fun==SIMIX_process_kill) { process = arg; DEBUG2("Killing %s on %s", process->name, - process->simdata->host->name); + process->simdata->s_host->name); SIMIX_process_kill(process); } } @@ -309,10 +389,10 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) if (elapsed_time == -1) { if (xbt_swag_size(simix_global->process_list) == 0) { - INFO0("Congratulations ! Simulation terminated : all processes are over"); +/* INFO0("Congratulations ! Simulation terminated : all processes are over"); */ } else { INFO0("Oops ! Deadlock or code not perfectly clean."); - __SIMIX_display_process_status(); + SIMIX_display_process_status(); if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) || XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) { DEBUG0("Aborting!"); @@ -350,14 +430,11 @@ int SIMIX_timer_get(void **function, void **arg) * \param function Create process function * */ -void SIMIX_function_register_process_create(void * function) +void SIMIX_function_register_process_create(smx_creation_func_t* function) { xbt_assert0((simix_global->create_process_function == NULL), "Data already set"); - /* Assign create process */ simix_global->create_process_function = function; - - return ; } /** @@ -367,12 +444,21 @@ void SIMIX_function_register_process_create(void * function) * \param function Kill process function * */ -void SIMIX_function_register_process_kill(void * function) +void SIMIX_function_register_process_kill(void_f_pvoid_t* function) { xbt_assert0((simix_global->kill_process_function == NULL), "Data already set"); - /* Assign kill process */ simix_global->kill_process_function = function; +} - return ; +/** + * \brief Registers a function to cleanup a process. + * + * This function registers an user function to be called when a new process ends properly. + * \param function cleanup process function + * + */ +void SIMIX_function_register_process_cleanup(void_f_pvoid_t* function) +{ + simix_global->cleanup_process_function = function; }