/* 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 <xbt/base.h>
+
+#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" {
// ***** 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 =
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;
// ***** 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();
+ simgrid::mc::Process* process = &mc_model_checker->process();
xbt_assert(!process->object_infos.empty(), "MC subsystem not initialized");
- for (std::shared_ptr<s_mc_object_info_t> const& info : process->object_infos) {
+ for (std::shared_ptr<simgrid::mc::ObjectInformation> const& info : process->object_infos) {
// Binary search:
int start = 0;
int end = info->global_variables.size() - 1;
while (start <= end) {
unsigned int cursor = (start + end) / 2;
- mc_variable_t current_var = &info->global_variables[cursor];
- int cmp = strcmp(current_var->name.c_str(), name);
+ 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);
static void mc_ignore_local_variable_in_scope(const char *var_name,
const char *subprogram_name,
- mc_frame_t subprogram,
- mc_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;
- for (std::shared_ptr<s_mc_object_info_t> const& info : process->object_infos)
+ for (std::shared_ptr<simgrid::mc::ObjectInformation> 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;
- mc_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
*/
static void mc_ignore_local_variable_in_scope(const char *var_name,
const char *subprogram_name,
- mc_frame_t subprogram,
- mc_frame_t scope)
+ simgrid::mc::Frame* subprogram,
+ simgrid::mc::Frame* scope)
{
// Processing of direct variables:
// Dichotomic search:
while (start <= end) {
int cursor = (start + end) / 2;
- mc_variable_t current_var = &scope->variables[cursor];
+ simgrid::mc::Variable* current_var = &scope->variables[cursor];
- int compare = strcmp(current_var->name.c_str(), var_name);
+ int compare = current_var->name.compare(var_name);
if (compare == 0) {
// Variable found, remove it:
scope->variables.erase(scope->variables.begin() + cursor);
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:
- mc_frame_t nested_subprogram =
+ simgrid::mc::Frame* nested_subprogram =
nested_scope.tag ==
DW_TAG_inlined_subroutine ? &nested_scope : subprogram;
}
}
-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);