#include <link.h>
#include <dirent.h>
-#include "internal_config.h"
-#include "mc_memory_map.h"
+#include "src/internal_config.h"
#include "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/mc.h>
#include "mc_snapshot.h"
-#include "mc_dwarf.hpp"
+#include "mc_object_info.h"
#include "mc_mmu.h"
#include "mc_unw.h"
#include "mc_protocol.h"
#include "mc_smx.h"
#include "mc_hash.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Frame.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
using simgrid::mc::remote;
/************************************ Free functions **************************************/
/*****************************************************************************************/
-int MC_important_snapshot(mc_snapshot_t snapshot)
-{
- // We need this snapshot in order to know which
- // pages needs to be stored in the next snapshot.
- // This field is only non-NULL when using soft-dirty
- // page tracking.
- if (snapshot == mc_model_checker->parent_snapshot_)
- return true;
-
- return false;
-}
-
/** @brief Restore a region from a snapshot
*
* @param reg Target region
#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
+ RegionType region_type, void *start_addr, void* permanent_addr,
+ std::size_t size, const simgrid::mc::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)
{
- const char* file_name = xbt_strdup(result->file_name.c_str());
+ 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;
xbt_assert(result->start_rw);
xbt_assert(result->start_exec);
+ free(file_name);
}
/************************************* Take Snapshot ************************************/
* \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:
}
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();
if (current_variable.address != NULL) {
new_var.address = current_variable.address;
} else if (!current_variable.location_list.empty()) {
- s_mc_location_t location;
- mc_dwarf_resolve_locations(
- &location, ¤t_variable.location_list,
- current_variable.object_info,
- &(stack_frame->unw_cursor),
- (void *) stack_frame->frame_base,
- &mc_model_checker->process(), process_index);
-
- switch(mc_get_location_type(&location)) {
- case MC_LOCATION_TYPE_ADDRESS:
- new_var.address = location.memory_location;
- break;
- case MC_LOCATION_TYPE_REGISTER:
- default:
+ simgrid::dwarf::Location location =
+ simgrid::dwarf::resolve(
+ current_variable.location_list,
+ current_variable.object_info,
+ &(stack_frame->unw_cursor),
+ (void *) stack_frame->frame_base,
+ &mc_model_checker->process(), process_index);
+
+ if (!location.in_memory())
xbt_die("Cannot handle non-address variable");
- }
+ new_var.address = location.address();
} else {
xbt_die("No address");
if (frame) {
stack_frame.frame_name = frame->name;
stack_frame.frame_base =
- (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c);
+ (unw_word_t) frame->frame_base(c);
} else {
stack_frame.frame_base = 0;
stack_frame.frame_name = std::string();
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
- xbt_assert(snapshot->process);
+ xbt_assert(snapshot->process());
// Copy the memory:
for (auto const& region : mc_model_checker->process().ignored_regions()) {
ignored_data.start = (void*)region.addr;
ignored_data.data.resize(region.size);
// TODO, we should do this once per privatization segment:
- snapshot->process->read_bytes(
+ snapshot->process()->read_bytes(
ignored_data.data.data(), region.size, remote(region.addr),
simgrid::mc::ProcessIndexDisabled);
snapshot->ignored_data.push_back(std::move(ignored_data));
// Zero the memory:
for(auto const& region : mc_model_checker->process().ignored_regions()) {
- snapshot->process->clear_bytes(remote(region.addr), region.size);
+ snapshot->process()->clear_bytes(remote(region.addr), region.size);
}
}
static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
{
for (auto const& ignored_data : snapshot->ignored_data)
- snapshot->process->write_bytes(
+ snapshot->process()->write_bytes(
ignored_data.data.data(), ignored_data.data.size(),
remote(ignored_data.start));
}
simgrid::mc::Process* mc_process = &mc_model_checker->process();
- mc_snapshot_t snapshot = new simgrid::mc::Snapshot();
+ mc_snapshot_t snapshot = new simgrid::mc::Snapshot(mc_process);
- snapshot->process = mc_process;
snapshot->num_state = num_state;
smx_process_t process;
if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks =
MC_take_snapshot_stacks(&snapshot);
- if (_sg_mc_hash && !snapshot->stacks.empty()) {
+ if (_sg_mc_hash) {
snapshot->hash = simgrid::mc::hash(*snapshot);
} else {
snapshot->hash = 0;
#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
}
