void MCer_ignore_global_variable(const char *name)
{
mc_process_t process = &mc_model_checker->process();
- xbt_assert(process->object_infos, "MC subsystem not initialized");
+ 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<s_mc_object_info_t> const& info : process->object_infos) {
// Binary search:
int start = 0;
if (strcmp(frame_name, "*") == 0)
frame_name = NULL;
- 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]);
- }
+ for (std::shared_ptr<s_mc_object_info_t> 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,
}
}
-// ****** 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);
- }
- }
-}
-
extern xbt_dynar_t stacks_areas;
void MC_stack_area_add(stack_region_t stack_area)