#include <dirent.h>
#include "src/internal_config.h"
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
#include "xbt/module.h"
#include <xbt/mmalloc.h>
#include "src/smpi/private.h"
#include <libunwind.h>
#include <libelf.h>
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
#include <mc/mc.h>
-#include "mc_snapshot.h"
-#include "mc_object_info.h"
-#include "mc_mmu.h"
-#include "mc_unw.h"
-#include "mc_protocol.h"
-#include "mc_smx.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_smx.h"
#include "mc_hash.hpp"
+#include "src/mc/RegionSnapshot.hpp"
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/Frame.hpp"
#include "src/mc/Variable.hpp"
namespace mc {
#ifdef HAVE_SMPI
-simgrid::mc::RegionSnapshot privatized_region(
+RegionSnapshot privatized_region(
RegionType region_type, void *start_addr, void* permanent_addr,
- std::size_t size, const simgrid::mc::RegionSnapshot* ref_region
+ std::size_t size, const RegionSnapshot* ref_region
)
{
size_t process_count = MC_smpi_process_count();
simgrid::mc::ObjectInformation* result)
{
char* file_name = xbt_strdup(result->file_name.c_str());
- const char *name = basename(file_name);
+ const char *name = xbt_basename(file_name);
for (size_t i = 0; i < maps.size(); ++i) {
simgrid::xbt::VmMap const& reg = maps[i];
if (maps[i].pathname.empty()
- || strcmp(basename(maps[i].pathname.c_str()), name)) {
+ || strcmp(xbt_basename(maps[i].pathname.c_str()), name)) {
// Nothing to do
} else if ((reg.prot & PROT_WRITE)) {
xbt_assert(!result->start_rw,
const void *ip)
{
// The variable is not yet valid:
- if ((const void *) ((const char *) scope->low_pc + var->start_scope) > ip)
+ if (scope->range.begin() + var->start_scope > (std::uint64_t) ip)
return false;
else
return true;
{
simgrid::mc::Process* process = &mc_model_checker->process();
- void *ip = (void *) stack_frame->ip;
- if (ip < scope->low_pc || ip >= scope->high_pc)
+ if (!scope->range.contain(stack_frame->ip))
return;
for(simgrid::mc::Variable& current_variable :
{
std::vector<s_mc_snapshot_stack_t> res;
- unsigned int cursor = 0;
- stack_region_t current_stack;
-
- // FIXME, cross-process support (stack_areas)
- xbt_dynar_foreach(stacks_areas, cursor, current_stack) {
+ for (auto const& stack : mc_model_checker->process().stack_areas()) {
s_mc_snapshot_stack_t st;
// Read the context from remote process:
unw_context_t context;
mc_model_checker->process().read_bytes(
- &context, sizeof(context), remote(current_stack->context));
+ &context, sizeof(context), remote(stack.context));
if (mc_unw_init_context(&st.context, &mc_model_checker->process(),
&context) < 0) {
xbt_die("Could not initialise the libunwind context.");
}
st.stack_frames = MC_unwind_stack_frames(&st.context);
- st.local_variables = MC_get_local_variables_values(st.stack_frames, current_stack->process_index);
- st.process_index = current_stack->process_index;
+ st.local_variables = MC_get_local_variables_values(st.stack_frames, stack.process_index);
+ st.process_index = stack.process_index;
unw_word_t sp = st.stack_frames[0].sp;
res.push_back(std::move(st));
size_t stack_size =
- (char*) current_stack->address + current_stack->size - (char*) sp;
+ (char*) stack.address + stack.size - (char*) sp;
(*snapshot)->stack_sizes.push_back(stack_size);
}
}
-static std::vector<s_mc_heap_ignore_region_t> MC_take_snapshot_ignore()
-{
- std::vector<s_mc_heap_ignore_region_t> res;
-
- if (mc_heap_comparison_ignore == NULL)
- return std::move(res);
-
- unsigned int cursor = 0;
- mc_heap_ignore_region_t current_region;
-
- xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) {
- s_mc_heap_ignore_region_t new_region;
- new_region.address = current_region->address;
- new_region.size = current_region->size;
- new_region.block = current_region->block;
- new_region.fragment = current_region->fragment;
- res.push_back(std::move(new_region));
- }
-
- return std::move(res);
-}
-
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
xbt_assert(snapshot->process());
struct dirent* fd_number;
while ((fd_number = readdir(fd_dir))) {
- int fd_value = atoi(fd_number->d_name);
+ int fd_value = xbt_str_parse_int(fd_number->d_name, "Found a non-numerical FD: %s. Freaking out!");
if(fd_value < 3)
continue;
continue;
// If dot_output enabled, do not handle the corresponding file
- if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0)
+ if (dot_output != NULL && strcmp(xbt_basename(link), _sg_mc_dot_output_file) == 0)
continue;
// This is probably a shared memory used by lttng-ust:
if (use_soft_dirty)
mc_process->reset_soft_dirty();
- snapshot->to_ignore = MC_take_snapshot_ignore();
+ snapshot->to_ignore = mc_model_checker->process().ignored_heap();
if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks =
