#include <link.h>
#include <dirent.h>
-#include "internal_config.h"
-#include "mc_memory_map.h"
-#include "mc_private.h"
+#include "src/internal_config.h"
+#include "src/mc/mc_private.h"
#include "xbt/module.h"
#include <xbt/mmalloc.h>
-#include "../smpi/private.h"
+#include "src/smpi/private.h"
#include <alloca.h>
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
-#include "../simix/smx_private.h"
+#include "src/simix/smx_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 "mc/ObjectInformation.hpp"
-#include "mc/Frame.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/RegionSnapshot.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
using simgrid::mc::remote;
namespace mc {
#ifdef HAVE_SMPI
-simgrid::mc::RegionSnapshot privatized_region(
- RegionType region_type, void *start_addr, void* permanent_addr, size_t size,
- const simgrid::mc::RegionSnapshot* ref_region
+RegionSnapshot privatized_region(
+ RegionType region_type, void *start_addr, void* permanent_addr,
+ std::size_t size, const RegionSnapshot* ref_region
)
{
size_t process_count = MC_smpi_process_count();
static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
simgrid::mc::RegionType type,
simgrid::mc::ObjectInformation* object_info,
- void *start_addr, void* permanent_addr, size_t size)
+ void *start_addr, void* permanent_addr,
+ std::size_t size)
{
if (type == simgrid::mc::RegionType::Data)
xbt_assert(object_info, "Missing object info for object.");
simgrid::mc::RegionSnapshot region;
#ifdef HAVE_SMPI
- const bool privatization_aware = object_info && object_info->privatized();
+ const bool privatization_aware = object_info
+ && mc_model_checker->process().privatized(*object_info);
if (privatization_aware && MC_smpi_process_count())
region = simgrid::mc::privatized_region(
type, start_addr, permanent_addr, size, ref_region);
process->get_malloc_info());
#ifdef HAVE_SMPI
- if (smpi_privatize_global_variables && MC_smpi_process_count()) {
+ if (mc_model_checker->process().privatized() && MC_smpi_process_count()) {
// snapshot->privatization_index = smpi_loaded_page
mc_model_checker->process().read_variable(
"smpi_loaded_page", &snapshot->privatization_index,
* `dl_iterate_phdr` would be more robust but would not work in cross-process.
* */
void MC_find_object_address(
- std::vector<simgrid::mc::VmMap> const& maps, simgrid::mc::ObjectInformation* result)
+ std::vector<simgrid::xbt::VmMap> const& maps,
+ simgrid::mc::ObjectInformation* result)
{
char* file_name = xbt_strdup(result->file_name.c_str());
const char *name = basename(file_name);
for (size_t i = 0; i < maps.size(); ++i) {
- simgrid::mc::VmMap const& reg = maps[i];
+ simgrid::xbt::VmMap const& reg = maps[i];
if (maps[i].pathname.empty()
|| strcmp(basename(maps[i].pathname.c_str()), name)) {
// Nothing to do
result->start_rw = (char*) reg.start_addr;
result->end_rw = (char*) reg.end_addr;
// .bss is usually after the .data:
- simgrid::mc::VmMap const& next = maps[i + 1];
+ simgrid::xbt::VmMap const& next = maps[i + 1];
if (next.pathname.empty() && (next.prot & PROT_WRITE)
&& next.start_addr == reg.end_addr) {
result->end_rw = (char*) maps[i + 1].end_addr;
* \param ip Instruction pointer
* \return true if the variable is valid
* */
-static bool mc_valid_variable(simgrid::mc::Variable* var, simgrid::mc::Frame* scope,
+static bool mc_valid_variable(simgrid::mc::Variable* var,
+ simgrid::mc::Frame* scope,
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;
}
static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
- simgrid::mc::Frame* scope, int process_index,
+ simgrid::mc::Frame* scope,
+ int process_index,
std::vector<s_local_variable>& result)
{
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;
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 =
#ifdef HAVE_SMPI
// TODO, send a message to implement this in the MCed process
if(snapshot->privatization_index >= 0) {
- // We just rewrote the global variables.
- // The privatisation segment SMPI thinks
- // is mapped might be inconsistent with the segment which
- // is really mapped in memory (kernel state).
- // We ask politely SMPI to map the segment anyway,
- // even if it thinks it is the current one:
- smpi_really_switch_data_segment(snapshot->privatization_index);
+ // Fix the privatization mmap:
+ s_mc_restore_message message;
+ message.type = MC_MESSAGE_RESTORE;
+ message.index = snapshot->privatization_index;
+ mc_model_checker->process().send_message(message);
}
#endif
}