X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638d55dcb8d944f7c74127725f1acb7b8e1449de..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/mc/mcer_ignore.cpp diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp index 3e8b3bf870..ce0478e9d2 100644 --- a/src/mc/mcer_ignore.cpp +++ b/src/mc/mcer_ignore.cpp @@ -4,14 +4,20 @@ /* 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 + +#include "src/internal_config.h" #include "mc_object_info.h" -#include "mc/mc_private.h" -#include "smpi/private.h" -#include "mc/mc_snapshot.h" -#include "mc/mc_ignore.h" -#include "mc/mc_protocol.h" -#include "mc/mc_client.h" +#include "src/mc/mc_private.h" +#include "src/smpi/private.h" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_ignore.h" +#include "src/mc/mc_protocol.h" +#include "src/mc/mc_client.h" + +#include "src/mc/Frame.hpp" +#include "src/mc/Variable.hpp" +#include "src/mc/ObjectInformation.hpp" extern "C" { @@ -20,20 +26,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mcer_ignore, mc, // ***** Ignore heap chunks -extern xbt_dynar_t mc_heap_comparison_ignore; +extern XBT_PRIVATE xbt_dynar_t mc_heap_comparison_ignore; -void heap_ignore_region_free(mc_heap_ignore_region_t r) +static void heap_ignore_region_free(mc_heap_ignore_region_t r) { xbt_free(r); } -void heap_ignore_region_free_voidp(void *r) +static void heap_ignore_region_free_voidp(void *r) { heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r); } -void MC_heap_region_ignore_insert(mc_heap_ignore_region_t region) +XBT_PRIVATE void MC_heap_region_ignore_insert(mc_heap_ignore_region_t region) { if (mc_heap_comparison_ignore == NULL) { mc_heap_comparison_ignore = @@ -72,7 +78,7 @@ void MC_heap_region_ignore_insert(mc_heap_ignore_region_t region) xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion); } -void MC_heap_region_ignore_remove(void *address, size_t size) +XBT_PRIVATE void MC_heap_region_ignore_remove(void *address, size_t size) { unsigned int cursor = 0; int start = 0; @@ -109,74 +115,61 @@ void MC_heap_region_ignore_remove(void *address, size_t size) // ***** Ignore global variables -void MCer_ignore_global_variable(const char *name) +XBT_PRIVATE void MCer_ignore_global_variable(const char *name) { - mc_process_t process = &mc_model_checker->process(); - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - xbt_assert(process->object_infos, "MC subsystem not initialized"); + simgrid::mc::Process* process = &mc_model_checker->process(); + xbt_assert(!process->object_infos.empty(), "MC subsystem not initialized"); - size_t n = process->object_infos_size; - for (size_t i=0; i!=n; ++i) { - mc_object_info_t info = process->object_infos[i]; + for (std::shared_ptr const& info : process->object_infos) { // Binary search: int start = 0; - int end = xbt_dynar_length(info->global_variables) - 1; + int end = info->global_variables.size() - 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); + simgrid::mc::Variable* current_var = &info->global_variables[cursor]; + int cmp = current_var->name.compare(name); + if (cmp == 0) { + info->global_variables.erase( + info->global_variables.begin() + cursor); start = 0; - end = xbt_dynar_length(info->global_variables) - 1; - } else if (strcmp(current_var->name, name) < 0) { + end = info->global_variables.size() - 1; + } else if (cmp < 0) { start = cursor + 1; } else { end = cursor - 1; } } } - mmalloc_set_current_heap(heap); } // ***** Ignore local variables static void mc_ignore_local_variable_in_scope(const char *var_name, const char *subprogram_name, - dw_frame_t subprogram, - dw_frame_t scope); + simgrid::mc::Frame* subprogram, + simgrid::mc::Frame* scope); static void MC_ignore_local_variable_in_object(const char *var_name, const char *subprogram_name, - mc_object_info_t info); + simgrid::mc::ObjectInformation* info); void MC_ignore_local_variable(const char *var_name, const char *frame_name) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); if (strcmp(frame_name, "*") == 0) frame_name = NULL; - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - 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]); - } - - mmalloc_set_current_heap(heap); + for (std::shared_ptr const& info : process->object_infos) + MC_ignore_local_variable_in_object(var_name, frame_name, info.get()); } static void MC_ignore_local_variable_in_object(const char *var_name, const char *subprogram_name, - mc_object_info_t info) + simgrid::mc::ObjectInformation* info) { - xbt_dict_cursor_t cursor2; - dw_frame_t frame; - char *key; - xbt_dict_foreach(info->subprograms, cursor2, key, frame) { - mc_ignore_local_variable_in_scope(var_name, subprogram_name, frame, frame); - } + for (auto& entry : info->subprograms) + mc_ignore_local_variable_in_scope( + var_name, subprogram_name, &entry.second, &entry.second); } /** \brief Ignore a local variable in a scope @@ -192,34 +185,33 @@ static void MC_ignore_local_variable_in_object(const char *var_name, */ static void mc_ignore_local_variable_in_scope(const char *var_name, const char *subprogram_name, - dw_frame_t subprogram, - dw_frame_t scope) + simgrid::mc::Frame* subprogram, + simgrid::mc::Frame* scope) { // Processing of direct variables: // If the current subprogram matches the given name: - if (!subprogram_name || - (subprogram->name && strcmp(subprogram_name, subprogram->name) == 0)) { + if (subprogram_name == nullptr || + (!subprogram->name.empty() + && subprogram->name == subprogram_name)) { // Try to find the variable and remove it: int start = 0; - int end = xbt_dynar_length(scope->variables) - 1; + int end = scope->variables.size() - 1; // Dichotomic search: while (start <= end) { int cursor = (start + end) / 2; - dw_variable_t current_var = - (dw_variable_t) xbt_dynar_get_as(scope->variables, cursor, - dw_variable_t); + simgrid::mc::Variable* current_var = &scope->variables[cursor]; - int compare = strcmp(current_var->name, var_name); + int compare = current_var->name.compare(var_name); if (compare == 0) { // Variable found, remove it: - xbt_dynar_remove_at(scope->variables, cursor, NULL); + scope->variables.erase(scope->variables.begin() + cursor); // and start again: start = 0; - end = xbt_dynar_length(scope->variables) - 1; + end = scope->variables.size() - 1; } else if (compare < 0) { start = cursor + 1; } else { @@ -229,96 +221,21 @@ static void mc_ignore_local_variable_in_scope(const char *var_name, } // And recursive processing in nested scopes: - unsigned cursor = 0; - dw_frame_t nested_scope = NULL; - xbt_dynar_foreach(scope->scopes, cursor, nested_scope) { + for (simgrid::mc::Frame& nested_scope : scope->scopes) { // The new scope may be an inlined subroutine, in this case we want to use its // namespaced name in recursive calls: - dw_frame_t nested_subprogram = - nested_scope->tag == - DW_TAG_inlined_subroutine ? nested_scope : subprogram; + simgrid::mc::Frame* nested_subprogram = + nested_scope.tag == + DW_TAG_inlined_subroutine ? &nested_scope : subprogram; mc_ignore_local_variable_in_scope(var_name, subprogram_name, - nested_subprogram, nested_scope); - } -} - -// ****** Checkpoint ignore: - -static void checkpoint_ignore_region_free(mc_checkpoint_ignore_region_t r) -{ - xbt_free(r); -} - -static void checkpoint_ignore_region_free_voidp(void *r) -{ - checkpoint_ignore_region_free((mc_checkpoint_ignore_region_t) * (void **) r); -} - -xbt_dynar_t MC_checkpoint_ignore_new(void) -{ - return xbt_dynar_new(sizeof(mc_checkpoint_ignore_region_t), - checkpoint_ignore_region_free_voidp); -} - -// ***** Generic memory ignore mechanism - -void MC_process_ignore_memory(mc_process_t process, void *addr, size_t size) -{ - xbt_dynar_t checkpoint_ignore = process->checkpoint_ignore; - mc_checkpoint_ignore_region_t region = - xbt_new0(s_mc_checkpoint_ignore_region_t, 1); - region->addr = addr; - region->size = size; - - if (xbt_dynar_is_empty(checkpoint_ignore)) { - xbt_dynar_push(checkpoint_ignore, ®ion); - } else { - - unsigned int cursor = 0; - int start = 0; - int end = xbt_dynar_length(checkpoint_ignore) - 1; - mc_checkpoint_ignore_region_t current_region = NULL; - - while (start <= end) { - cursor = (start + end) / 2; - current_region = - (mc_checkpoint_ignore_region_t) xbt_dynar_get_as(checkpoint_ignore, - cursor, - mc_checkpoint_ignore_region_t); - if (current_region->addr == addr) { - if (current_region->size == size) { - checkpoint_ignore_region_free(region); - return; - } else if (current_region->size < size) { - start = cursor + 1; - } else { - end = cursor - 1; - } - } else if (current_region->addr < addr) { - start = cursor + 1; - } else { - end = cursor - 1; - } - } - - if (current_region->addr == addr) { - if (current_region->size < size) { - xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, ®ion); - } else { - xbt_dynar_insert_at(checkpoint_ignore, cursor, ®ion); - } - } else if (current_region->addr < addr) { - xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, ®ion); - } else { - xbt_dynar_insert_at(checkpoint_ignore, cursor, ®ion); - } + nested_subprogram, &nested_scope); } } -extern xbt_dynar_t stacks_areas; +extern XBT_PRIVATE xbt_dynar_t stacks_areas; -void MC_stack_area_add(stack_region_t stack_area) +XBT_PRIVATE void MC_stack_area_add(stack_region_t stack_area) { if (stacks_areas == NULL) stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL);