X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1e64d5519d2e9304830d0b82a7988c8970db692..bc227ec698a0dcac6be3bd125dedd6dff346d1dd:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index b4de7e8266..651146425b 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -4,7 +4,7 @@ /* 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 "private.h" +#include "smx_private.h" #include "xbt/heap.h" #include "xbt/sysdep.h" #include "xbt/log.h" @@ -12,14 +12,6 @@ #include "xbt/ex.h" /* ex_backtrace_display */ #include "mc/mc.h" -XBT_LOG_EXTERNAL_CATEGORY(simix); -XBT_LOG_EXTERNAL_CATEGORY(simix_action); -XBT_LOG_EXTERNAL_CATEGORY(simix_deployment); -XBT_LOG_EXTERNAL_CATEGORY(simix_environment); -XBT_LOG_EXTERNAL_CATEGORY(simix_host); -XBT_LOG_EXTERNAL_CATEGORY(simix_process); -XBT_LOG_EXTERNAL_CATEGORY(simix_synchro); -XBT_LOG_EXTERNAL_CATEGORY(simix_context); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -43,7 +35,7 @@ static void _XBT_CALL inthandler(int ignored) SIMIX_display_process_status(); } else { - XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit disabled"); + XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit is disabled"); } exit(1); } @@ -67,14 +59,13 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_global) { /* Connect our log channels: that must be done manually under windows */ - XBT_LOG_CONNECT(simix_action, simix); + XBT_LOG_CONNECT(simix_context, simix); XBT_LOG_CONNECT(simix_deployment, simix); XBT_LOG_CONNECT(simix_environment, simix); XBT_LOG_CONNECT(simix_host, simix); XBT_LOG_CONNECT(simix_kernel, simix); XBT_LOG_CONNECT(simix_process, simix); XBT_LOG_CONNECT(simix_synchro, simix); - XBT_LOG_CONNECT(simix_context, simix); simix_global = xbt_new0(s_smx_global_t, 1); @@ -86,7 +77,7 @@ void SIMIX_global_init(int *argc, char **argv) xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); simix_global->maestro_process = NULL; - simix_global->registered_functions = xbt_dict_new(); + simix_global->registered_functions = xbt_dict_new_homogeneous(NULL); simix_global->create_process_function = SIMIX_process_create; simix_global->kill_process_function = SIMIX_process_kill; @@ -135,6 +126,7 @@ void SIMIX_clean(void) SIMIX_network_exit(); xbt_heap_free(simix_timers); + simix_timers = NULL; /* Free the remaining data structures */ xbt_dynar_free(&simix_global->process_to_run); xbt_dynar_free(&simix_global->process_that_ran); @@ -197,19 +189,20 @@ void SIMIX_run(void) #ifdef TIME_BENCH smx_ctx_raw_new_sr(); #endif - while (xbt_dynar_length(simix_global->process_to_run)) { + while (!xbt_dynar_is_empty(simix_global->process_to_run)) { XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run)); SIMIX_process_runall(); xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { - if (process->request.call != REQ_NO_REQ) { - XBT_DEBUG("Handling request %p", &process->request); - SIMIX_request_pre(&process->request, 0); + if (process->simcall.call != SIMCALL_NONE) { + SIMIX_simcall_pre(&process->simcall, 0); } } } - time = surf_solve(SIMIX_timer_next()); + time = SIMIX_timer_next(); + if (time != -1.0 || xbt_swag_size(simix_global->process_list) != 0) + time = surf_solve(time); /* Notify all the hosts that have failed */ /* FIXME: iterate through the list of failed host and mark each of them */ @@ -223,18 +216,20 @@ void SIMIX_run(void) if (timer->func) ((void (*)(void*))timer->func)(timer->args); } - /* Wake up all process waiting for the action finish */ + /* Wake up all processes waiting for a Surf action to finish */ xbt_dynar_foreach(model_list, iter, model) { - for (set = model->states.failed_action_set; - set; - set = (set == model->states.failed_action_set) - ? model->states.done_action_set - : NULL) { - while ((action = xbt_swag_extract(set))) - SIMIX_request_post((smx_action_t) action->data); - } + set = model->states.failed_action_set; + while ((action = xbt_swag_extract(set))) + SIMIX_simcall_post((smx_action_t) action->data); + set = model->states.done_action_set; + while ((action = xbt_swag_extract(set))) + SIMIX_simcall_post((smx_action_t) action->data); } - } while (time != -1.0); + + /* Clean processes to destroy */ + SIMIX_process_empty_trash(); + + } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); if (xbt_swag_size(simix_global->process_list) != 0) { @@ -322,7 +317,7 @@ void SIMIX_display_process_status(void) XBT_INFO("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ XBT_INFO - ("Legend of the following listing: \" on : .\""); + ("Legend of the following listing: \"Process (@): \""); xbt_swag_foreach(process, simix_global->process_list) { if (process->waiting_action) { @@ -330,51 +325,57 @@ void SIMIX_display_process_status(void) const char* action_description = "unknown"; switch (process->waiting_action->type) { - case SIMIX_ACTION_EXECUTE: - action_description = "execution"; - break; + case SIMIX_ACTION_EXECUTE: + action_description = "execution"; + break; - case SIMIX_ACTION_PARALLEL_EXECUTE: - action_description = "parallel execution"; - break; + case SIMIX_ACTION_PARALLEL_EXECUTE: + action_description = "parallel execution"; + break; - case SIMIX_ACTION_COMMUNICATE: - action_description = "communication"; - break; + case SIMIX_ACTION_COMMUNICATE: + action_description = "communication"; + break; - case SIMIX_ACTION_SLEEP: - action_description = "sleeping"; - break; + case SIMIX_ACTION_SLEEP: + action_description = "sleeping"; + break; - case SIMIX_ACTION_SYNCHRO: - action_description = "synchronization"; - break; + case SIMIX_ACTION_SYNCHRO: + action_description = "synchronization"; + break; - case SIMIX_ACTION_IO: - action_description = "I/O"; - break; + case SIMIX_ACTION_IO: + action_description = "I/O"; + break; } - XBT_INFO("Waiting for %s action %p to finish", action_description, process->waiting_action); + XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish", + process->pid, process->name, process->smx_host->name, + action_description, process->waiting_action, + process->waiting_action->name, (int)process->waiting_action->state); + } + else { + XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, process->smx_host->name); } } } static void* SIMIX_action_mallocator_new_f(void) { smx_action_t action = xbt_new(s_smx_action_t, 1); - action->request_list = xbt_fifo_new(); + action->simcalls = xbt_fifo_new(); return action; } static void SIMIX_action_mallocator_free_f(void* action) { - xbt_fifo_free(((smx_action_t) action)->request_list); + xbt_fifo_free(((smx_action_t) action)->simcalls); xbt_free(action); } static void SIMIX_action_mallocator_reset_f(void* action) { - // we also recycle the request list - xbt_fifo_t fifo = ((smx_action_t) action)->request_list; + // we also recycle the simcall list + xbt_fifo_t fifo = ((smx_action_t) action)->simcalls; xbt_fifo_reset(fifo); memset(action, 0, sizeof(s_smx_action_t)); - ((smx_action_t) action)->request_list = fifo; + ((smx_action_t) action)->simcalls = fifo; }