X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3080c6b0d097d6b3b7d5b3dda0592154ce438f64..6c9922204dbafacbc6d1cc25d519f7c9a46c96e9:/src/mc/mc_ignore.c diff --git a/src/mc/mc_ignore.c b/src/mc/mc_ignore.c index 8fab43ca0f..726cfefe46 100644 --- a/src/mc/mc_ignore.c +++ b/src/mc/mc_ignore.c @@ -4,7 +4,11 @@ /* 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 "internal_config.h" +#include "mc_object_info.h" #include "mc_private.h" +#include "smpi/private.h" +#include "mc/mc_snapshot.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ignore, mc, "Logging specific to MC ignore mechanism"); @@ -71,18 +75,16 @@ void MC_ignore_heap(void *address, size_t size) region->block = ((char *) address - - (char *) ((xbt_mheap_t) std_heap)->heapbase) / BLOCKSIZE + 1; + (char *) std_heap->heapbase) / BLOCKSIZE + 1; - if (((xbt_mheap_t) std_heap)->heapinfo[region->block].type == 0) { + if (std_heap->heapinfo[region->block].type == 0) { region->fragment = -1; - ((xbt_mheap_t) std_heap)->heapinfo[region->block].busy_block.ignore++; + std_heap->heapinfo[region->block].busy_block.ignore++; } else { region->fragment = - ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >> ((xbt_mheap_t) - std_heap)-> + ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >> std_heap-> heapinfo[region->block].type; - ((xbt_mheap_t) std_heap)->heapinfo[region->block].busy_frag.ignore[region-> - fragment]++; + std_heap->heapinfo[region->block].busy_frag.ignore[region->fragment]++; } if (mc_heap_comparison_ignore == NULL) { @@ -173,31 +175,34 @@ void MC_remove_ignore_heap(void *address, size_t size) void MC_ignore_global_variable(const char *name) { - + mc_process_t process = &mc_model_checker->process; int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); MC_SET_MC_HEAP; - xbt_assert(mc_libsimgrid_info, "MC subsystem not initialized"); + xbt_assert(process->object_infos, "MC subsystem not initialized"); - unsigned int cursor = 0; - dw_variable_t current_var; - int start = 0; - int end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; + size_t n = process->object_infos_size; + for (size_t i=0; i!=n; ++i) { + mc_object_info_t info = process->object_infos[i]; - while (start <= end) { - cursor = (start + end) / 2; - current_var = - (dw_variable_t) xbt_dynar_get_as(mc_libsimgrid_info->global_variables, - cursor, dw_variable_t); - if (strcmp(current_var->name, name) == 0) { - xbt_dynar_remove_at(mc_libsimgrid_info->global_variables, cursor, NULL); - start = 0; - end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; - } else if (strcmp(current_var->name, name) < 0) { - start = cursor + 1; - } else { - end = cursor - 1; + // Binary search: + int start = 0; + int end = xbt_dynar_length(info->global_variables) - 1; + while (start <= end) { + unsigned int cursor = (start + end) / 2; + dw_variable_t current_var = + (dw_variable_t) xbt_dynar_get_as(info->global_variables, + cursor, dw_variable_t); + if (strcmp(current_var->name, name) == 0) { + xbt_dynar_remove_at(info->global_variables, cursor, NULL); + start = 0; + end = xbt_dynar_length(info->global_variables) - 1; + } else if (strcmp(current_var->name, name) < 0) { + start = cursor + 1; + } else { + end = cursor - 1; + } } } @@ -224,7 +229,8 @@ static void mc_ignore_local_variable_in_scope(const char *var_name, // Processing of direct variables: // If the current subprogram matche the given name: - if (subprogram_name == NULL || strcmp(subprogram_name, subprogram->name) == 0) { + if (!subprogram_name || + (subprogram->name && strcmp(subprogram_name, subprogram->name) == 0)) { // Try to find the variable and remove it: int start = 0; @@ -282,6 +288,8 @@ static void MC_ignore_local_variable_in_object(const char *var_name, void MC_ignore_local_variable(const char *var_name, const char *frame_name) { + mc_process_t process = &mc_model_checker->process; + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); @@ -290,16 +298,29 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name) MC_SET_MC_HEAP; - MC_ignore_local_variable_in_object(var_name, frame_name, mc_libsimgrid_info); - if (frame_name != NULL) - MC_ignore_local_variable_in_object(var_name, frame_name, mc_binary_info); + size_t n = process->object_infos_size; + size_t i; + for (i=0; i!=n; ++i) { + MC_ignore_local_variable_in_object(var_name, frame_name, process->object_infos[i]); + } if (!raw_mem_set) MC_SET_STD_HEAP; } -void MC_new_stack_area(void *stack, char *name, void *context, size_t size) +/** @brief Register a stack in the model checker + * + * The stacks are allocated in the heap. The MC handle them especially + * when we analyse/compare the content of theap so it must be told where + * they are with this function. + * + * @param stack + * @param process Process owning the stack + * @param context + * @param size Size of the stack + */ +void MC_new_stack_area(void *stack, smx_process_t process, void *context, size_t size) { int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); @@ -312,12 +333,19 @@ void MC_new_stack_area(void *stack, char *name, void *context, size_t size) stack_region_t region = NULL; region = xbt_new0(s_stack_region_t, 1); region->address = stack; - region->process_name = strdup(name); + region->process_name = process && process->name ? strdup(process->name) : NULL; region->context = context; region->size = size; region->block = ((char *) stack - - (char *) ((xbt_mheap_t) std_heap)->heapbase) / BLOCKSIZE + 1; + (char *) std_heap->heapbase) / BLOCKSIZE + 1; +#ifdef HAVE_SMPI + if (smpi_privatize_global_variables && process) { + region->process_index = smpi_process_index_of_smx_process(process); + } else +#endif + region->process_index = -1; + xbt_dynar_push(stacks_areas, ®ion); if (!raw_mem_set)