X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/208924f0b511eb55c98c74a56a9d9e6b7430c370..2cc8ea0d3fabf1676e26e7361de7c45d09d5a2b6:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 059130d929..a486e41fb3 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -26,12 +26,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, smx_global_t simix_global = NULL; static xbt_heap_t simix_timers = NULL; +static void* SIMIX_action_mallocator_new_f(void); +static void SIMIX_action_mallocator_free_f(void* action); +static void SIMIX_action_mallocator_reset_f(void* action); + +extern void smx_ctx_raw_new_sr(void); + /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include static void _XBT_CALL inthandler(int ignored) { - INFO0("CTRL-C pressed. Displaying status and bailing out"); + XBT_INFO("CTRL-C pressed. Displaying status and bailing out"); SIMIX_display_process_status(); exit(1); } @@ -76,9 +82,12 @@ void SIMIX_global_init(int *argc, char **argv) simix_global->maestro_process = NULL; simix_global->registered_functions = xbt_dict_new(); - simix_global->create_process_function = NULL; - simix_global->kill_process_function = NULL; + simix_global->create_process_function = SIMIX_process_create; + simix_global->kill_process_function = SIMIX_process_kill; simix_global->cleanup_process_function = SIMIX_process_cleanup; + simix_global->action_mallocator = xbt_mallocator_new(65536, + SIMIX_action_mallocator_new_f, SIMIX_action_mallocator_free_f, + SIMIX_action_mallocator_reset_f); surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); @@ -100,6 +109,9 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_timers) { simix_timers = xbt_heap_new(8, &free); } + + XBT_DEBUG("ADD SIMIX LEVELS"); + SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,free); } /** @@ -109,8 +121,12 @@ void SIMIX_global_init(int *argc, char **argv) */ void SIMIX_clean(void) { +#ifdef TIME_BENCH + smx_ctx_raw_new_sr(); +#endif + /* Kill everyone (except maestro) */ - SIMIX_process_killall(); + SIMIX_process_killall(simix_global->maestro_process); /* Exit the SIMIX network module */ SIMIX_network_exit(); @@ -143,6 +159,7 @@ void SIMIX_clean(void) surf_exit(); + xbt_mallocator_free(simix_global->action_mallocator); xbt_free(simix_global); simix_global = NULL; @@ -175,12 +192,17 @@ void SIMIX_run(void) unsigned int iter; do { + XBT_DEBUG("New Schedule Round; size(queue)=%lu", + xbt_dynar_length(simix_global->process_to_run)); +#ifdef TIME_BENCH + smx_ctx_raw_new_sr(); +#endif do { - DEBUG1("New Schedule Round; size(queue)=%lu", - xbt_dynar_length(simix_global->process_to_run)); + XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu", + xbt_dynar_length(simix_global->process_to_run)); SIMIX_context_runall(simix_global->process_to_run); while ((req = SIMIX_request_pop())) { - DEBUG1("Handling request %p", req); + XBT_DEBUG("Handling request %p", req); SIMIX_request_pre(req, 0); } } while (xbt_dynar_length(simix_global->process_to_run)); @@ -214,7 +236,7 @@ void SIMIX_run(void) if (xbt_swag_size(simix_global->process_list) != 0) { - WARN0("Oops ! Deadlock or code not perfectly clean."); + XBT_WARN("Oops ! Deadlock or code not perfectly clean."); SIMIX_display_process_status(); xbt_abort(); } @@ -240,43 +262,40 @@ XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg) } /** - * \brief Registers a function to create a process. - * - * This function registers an user function to be called when a new process is created. The user function have to call the SIMIX_create_process function. - * \param function Create process function + * \brief Registers a function to create a process. * + * This function registers a function to be called + * when a new process is created. The function has + * to call SIMIX_process_create(). + * \param function create process function */ XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t function) { - xbt_assert0((simix_global->create_process_function == NULL), - "Data already set"); - simix_global->create_process_function = function; } /** - * \brief Registers a function to kill a process. + * \brief Registers a function to kill a process. * - * This function registers an user function to be called when a new process is killed. The user function have to call the SIMIX_kill_process function. - * \param function Kill process function + * This function registers a function to be called when a + * process is killed. The function has to call the SIMIX_process_kill(). * + * \param function Kill process function */ -XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t +XBT_INLINE void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function) { - xbt_assert0((simix_global->kill_process_function == NULL), - "Data already set"); - simix_global->kill_process_function = function; } /** - * \brief Registers a function to cleanup a process. + * \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 + * This function registers a user function to be called when + * a process ends properly. * + * \param function cleanup process function */ XBT_INLINE void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function) @@ -294,9 +313,9 @@ void SIMIX_display_process_status(void) smx_process_t process = NULL; int nbprocess = xbt_swag_size(simix_global->process_list); - INFO1("%d processes are still running, waiting for something.", nbprocess); + XBT_INFO("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ - INFO0 + XBT_INFO ("Legend of the following listing: \" on : .\""); xbt_swag_foreach(process, simix_global->process_list) { @@ -329,7 +348,27 @@ void SIMIX_display_process_status(void) action_description = "I/O"; break; } - INFO2("Waiting for %s action %p to finish", action_description, process->waiting_action); + XBT_INFO("Waiting for %s action %p to finish", action_description, process->waiting_action); } } } + +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(); + return action; +} + +static void SIMIX_action_mallocator_free_f(void* action) { + xbt_fifo_free(((smx_action_t) action)->request_list); + 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; + xbt_fifo_reset(fifo); + memset(action, 0, sizeof(s_smx_action_t)); + ((smx_action_t) action)->request_list = fifo; +}