-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <link.h>
#include <dirent.h>
-#include "internal_config.h"
+#include "src/internal_config.h"
#include "mc_memory_map.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_unw.h"
#include "mc_protocol.h"
#include "mc_smx.h"
+#include "mc_hash.hpp"
+
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
+
+using simgrid::mc::remote;
extern "C" {
/************************************ Free functions **************************************/
/*****************************************************************************************/
-static void MC_snapshot_stack_free(mc_snapshot_stack_t s)
-{
- if (s) {
- xbt_dynar_free(&(s->local_variables));
- xbt_dynar_free(&(s->stack_frames));
- mc_unw_destroy_context(s->context);
- xbt_free(s->context);
- xbt_free(s);
- }
-}
-
-static void MC_snapshot_stack_free_voidp(void *s)
-{
- mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s;
- MC_snapshot_stack_free(stack);
-}
-
-static void local_variable_free(local_variable_t v)
-{
- xbt_free(v->name);
- xbt_free(v);
-}
-
-static void local_variable_free_voidp(void *v)
-{
- local_variable_free((local_variable_t) * (void **) v);
-}
-
-void MC_region_destroy(mc_mem_region_t region)
-{
- if (!region)
- return;
- switch(region->storage_type) {
- case MC_REGION_STORAGE_TYPE_NONE:
- break;
- case MC_REGION_STORAGE_TYPE_FLAT:
- xbt_free(region->flat.data);
- break;
- case MC_REGION_STORAGE_TYPE_CHUNKED:
- mc_free_page_snapshot_region(region->chunked.page_numbers, mc_page_count(region->size));
- xbt_free(region->chunked.page_numbers);
- break;
- case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- {
- size_t regions_count = region->privatized.regions_count;
- for (size_t i=0; i!=regions_count; ++i) {
- MC_region_destroy(region->privatized.regions[i]);
- }
- free(region->privatized.regions);
- break;
- }
- }
- xbt_free(region);
-}
-
-void MC_free_snapshot(mc_snapshot_t snapshot)
-{
- for (size_t i = 0; i < snapshot->snapshot_regions_count; i++) {
- MC_region_destroy(snapshot->snapshot_regions[i]);
- }
- xbt_free(snapshot->snapshot_regions);
- xbt_free(snapshot->stack_sizes);
- xbt_dynar_free(&(snapshot->stacks));
- xbt_dynar_free(&(snapshot->to_ignore));
- xbt_dynar_free(&snapshot->ignored_data);
- xbt_free(snapshot);
-}
-
-/******************************* Snapshot regions ********************************/
-/*********************************************************************************/
-
-static mc_mem_region_t mc_region_new_dense(
- mc_region_type_t region_type,
- void *start_addr, void* permanent_addr, size_t size)
-{
- mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1);
- region->region_type = region_type;
- region->storage_type = MC_REGION_STORAGE_TYPE_FLAT;
- region->start_addr = start_addr;
- region->permanent_addr = permanent_addr;
- region->size = size;
- region->flat.data = xbt_malloc(size);
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- region->flat.data, permanent_addr, size,
- MC_PROCESS_INDEX_DISABLED);
- XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu",
- region_type, region->flat.data, permanent_addr, size);
- return region;
-}
-
-/** @brief Take a snapshot of a given region
- *
- * @param type
- * @param start_addr Address of the region in the simulated process
- * @param permanent_addr Permanent address of this data (for privatized variables, this is the virtual address of the privatized mapping)
- * @param size Size of the data*
- */
-static mc_mem_region_t MC_region_new(
- mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size)
-{
- if (_sg_mc_sparse_checkpoint) {
- return mc_region_new_sparse(type, start_addr, permanent_addr, size);
- } else {
- return mc_region_new_dense(type, start_addr, permanent_addr, size);
- }
-}
-
/** @brief Restore a region from a snapshot
*
* @param reg Target region
*/
static void MC_region_restore(mc_mem_region_t region)
{
- switch(region->storage_type) {
- case MC_REGION_STORAGE_TYPE_NONE:
+ switch(region->storage_type()) {
+ case simgrid::mc::StorageType::NoData:
default:
xbt_die("Storage type not supported");
break;
- case MC_REGION_STORAGE_TYPE_FLAT:
- MC_process_write(&mc_model_checker->process(), region->flat.data,
- region->permanent_addr, region->size);
+ case simgrid::mc::StorageType::Flat:
+ mc_model_checker->process().write_bytes(region->flat_data(),
+ region->size(), region->permanent_address());
break;
- case MC_REGION_STORAGE_TYPE_CHUNKED:
+ case simgrid::mc::StorageType::Chunked:
mc_region_restore_sparse(&mc_model_checker->process(), region);
break;
- case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- {
- size_t process_count = region->privatized.regions_count;
- for (size_t i = 0; i < process_count; i++) {
- MC_region_restore(region->privatized.regions[i]);
- }
- break;
- }
+ case simgrid::mc::StorageType::Privatized:
+ for (auto& p : region->privatized_data())
+ MC_region_restore(&p);
+ break;
}
}
-static mc_mem_region_t MC_region_new_privatized(
- mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
+}
+
+namespace simgrid {
+namespace mc {
+
+#ifdef HAVE_SMPI
+simgrid::mc::RegionSnapshot privatized_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();
- mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1);
- region->region_type = region_type;
- region->storage_type = MC_REGION_STORAGE_TYPE_PRIVATIZED;
- region->start_addr = start_addr;
- region->permanent_addr = permanent_addr;
- region->size = size;
- region->privatized.regions_count = process_count;
- region->privatized.regions = xbt_new(mc_mem_region_t, process_count);
// Read smpi_privatisation_regions from MCed:
smpi_privatisation_region_t remote_smpi_privatisation_regions;
- MC_process_read_variable(&mc_model_checker->process(),
+ mc_model_checker->process().read_variable(
"smpi_privatisation_regions",
&remote_smpi_privatisation_regions, sizeof(remote_smpi_privatisation_regions));
s_smpi_privatisation_region_t privatisation_regions[process_count];
- MC_process_read_simple(&mc_model_checker->process(), &privatisation_regions,
- remote_smpi_privatisation_regions, sizeof(privatisation_regions));
+ mc_model_checker->process().read_bytes(
+ &privatisation_regions, sizeof(privatisation_regions),
+ remote(remote_smpi_privatisation_regions));
+ std::vector<simgrid::mc::RegionSnapshot> data;
+ data.reserve(process_count);
for (size_t i = 0; i < process_count; i++) {
- region->privatized.regions[i] =
- MC_region_new(region_type, start_addr,
- privatisation_regions[i].address, size);
+ const simgrid::mc::RegionSnapshot* ref_privatized_region = nullptr;
+ if (ref_region && ref_region->storage_type() == StorageType::Privatized)
+ ref_privatized_region = &ref_region->privatized_data()[i];
+ data.push_back(simgrid::mc::region(region_type, start_addr,
+ privatisation_regions[i].address, size, ref_privatized_region));
}
- return region;
+ simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
+ region_type, start_addr, permanent_addr, size);
+ region.privatized_data(std::move(data));
+ return std::move(region);
+}
+#endif
+
+}
}
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
- mc_object_info_t object_info,
- void *start_addr, void* permanent_addr, size_t size)
+extern "C" {
+
+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,
+ std::size_t size)
{
- if (type == MC_REGION_TYPE_DATA)
+ if (type == simgrid::mc::RegionType::Data)
xbt_assert(object_info, "Missing object info for object.");
- else if (type == MC_REGION_TYPE_HEAP)
+ else if (type == simgrid::mc::RegionType::Heap)
xbt_assert(!object_info, "Unexpected object info for heap region.");
- mc_mem_region_t region;
- const bool privatization_aware = MC_object_info_is_privatized(object_info);
+ simgrid::mc::RegionSnapshot const* ref_region = nullptr;
+ if (mc_model_checker->parent_snapshot_)
+ ref_region = mc_model_checker->parent_snapshot_->snapshot_regions[index].get();
+
+ simgrid::mc::RegionSnapshot region;
+#ifdef HAVE_SMPI
+ const bool privatization_aware = object_info && object_info->privatized();
if (privatization_aware && MC_smpi_process_count())
- region = MC_region_new_privatized(type, start_addr, permanent_addr, size);
+ region = simgrid::mc::privatized_region(
+ type, start_addr, permanent_addr, size, ref_region);
else
- region = MC_region_new(type, start_addr, permanent_addr, size);
+#endif
+ region = simgrid::mc::region(type, start_addr, permanent_addr, size, ref_region);
- region->object_info = object_info;
- snapshot->snapshot_regions[index] = region;
+ region.object_info(object_info);
+ snapshot->snapshot_regions[index]
+ = std::unique_ptr<simgrid::mc::RegionSnapshot>(
+ new simgrid::mc::RegionSnapshot(std::move(region)));
return;
}
-static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot)
+static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot)
{
- const size_t n = process->object_infos_size;
- snapshot->snapshot_regions_count = n + 1;
- snapshot->snapshot_regions = xbt_new0(mc_mem_region_t, n + 1);
-
- for (size_t i = 0; i!=n; ++i) {
- mc_object_info_t object_info = process->object_infos[i];
- MC_snapshot_add_region(i, snapshot, MC_REGION_TYPE_DATA, object_info,
+ const size_t n = process->object_infos.size();
+ snapshot->snapshot_regions.resize(n + 1);
+ int i = 0;
+ for (auto const& object_info : process->object_infos) {
+ MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data,
+ object_info.get(),
object_info->start_rw, object_info->start_rw,
object_info->end_rw - object_info->start_rw);
+ ++i;
}
- xbt_mheap_t heap = MC_process_get_heap(process);
+ xbt_mheap_t heap = process->get_heap();
void *start_heap = heap->base;
void *end_heap = heap->breakval;
- MC_snapshot_add_region(n, snapshot, MC_REGION_TYPE_HEAP, NULL,
+ MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,
start_heap, start_heap,
(char *) end_heap - (char *) start_heap);
snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(
heap->heaplimit,
- MC_process_get_malloc_info(process));
+ process->get_malloc_info());
#ifdef HAVE_SMPI
if (smpi_privatize_global_variables && MC_smpi_process_count()) {
// snapshot->privatization_index = smpi_loaded_page
- MC_process_read_variable(&mc_model_checker->process(),
+ mc_model_checker->process().read_variable(
"smpi_loaded_page", &snapshot->privatization_index,
sizeof(snapshot->privatization_index));
} else
#endif
{
- snapshot->privatization_index = MC_PROCESS_INDEX_MISSING;
+ snapshot->privatization_index = simgrid::mc::ProcessIndexMissing;
}
}
*
* `dl_iterate_phdr` would be more robust but would not work in cross-process.
* */
-void MC_find_object_address(memory_map_t maps, mc_object_info_t result)
+void MC_find_object_address(
+ std::vector<simgrid::mc::VmMap> const& maps,
+ simgrid::mc::ObjectInformation* result)
{
- ssize_t i = 0;
- s_map_region_t reg;
- const char *name = basename(result->file_name);
- while (i < maps->mapsize) {
- reg = maps->regions[i];
- if (maps->regions[i].pathname == NULL
- || strcmp(basename(maps->regions[i].pathname), name)) {
+ 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];
+ if (maps[i].pathname.empty()
+ || strcmp(basename(maps[i].pathname.c_str()), name)) {
// Nothing to do
} else if ((reg.prot & PROT_WRITE)) {
xbt_assert(!result->start_rw,
"Multiple read-write segments for %s, not supported",
- maps->regions[i].pathname);
+ maps[i].pathname.c_str());
result->start_rw = (char*) reg.start_addr;
result->end_rw = (char*) reg.end_addr;
// .bss is usually after the .data:
- s_map_region_t *next = &(maps->regions[i + 1]);
- if (next->pathname == NULL && (next->prot & PROT_WRITE)
- && next->start_addr == reg.end_addr) {
- result->end_rw = (char*) maps->regions[i + 1].end_addr;
+ simgrid::mc::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;
}
} else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)) {
xbt_assert(!result->start_exec,
"Multiple executable segments for %s, not supported",
- maps->regions[i].pathname);
+ maps[i].pathname.c_str());
result->start_exec = (char*) reg.start_addr;
result->end_exec = (char*) reg.end_addr;
} else if ((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) {
xbt_assert(!result->start_ro,
"Multiple read only segments for %s, not supported",
- maps->regions[i].pathname);
+ maps[i].pathname.c_str());
result->start_ro = (char*) reg.start_addr;
result->end_ro = (char*) reg.end_addr;
}
- i++;
}
result->start = result->start_rw;
if (result->end_exec && (const void*) result->end_exec > result->end)
result->end = result->end_exec;
- xbt_assert(result->file_name);
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(dw_variable_t var, dw_frame_t 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,
- dw_frame_t scope, int process_index, xbt_dynar_t result)
+ simgrid::mc::Frame* scope,
+ int process_index,
+ std::vector<s_local_variable>& result)
{
- mc_process_t process = &mc_model_checker->process();
+ simgrid::mc::Process* process = &mc_model_checker->process();
void *ip = (void *) stack_frame->ip;
if (ip < scope->low_pc || ip >= scope->high_pc)
return;
- unsigned cursor = 0;
- dw_variable_t current_variable;
- xbt_dynar_foreach(scope->variables, cursor, current_variable) {
+ for(simgrid::mc::Variable& current_variable :
+ scope->variables) {
- if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip))
+ if (!mc_valid_variable(¤t_variable, scope, (void *) stack_frame->ip))
continue;
int region_type;
else
region_type = 2;
- local_variable_t new_var = xbt_new0(s_local_variable_t, 1);
- new_var->subprogram = stack_frame->frame;
- new_var->ip = stack_frame->ip;
- new_var->name = xbt_strdup(current_variable->name);
- new_var->type = current_variable->type;
- new_var->region = region_type;
-
- if (current_variable->address != NULL) {
- new_var->address = current_variable->address;
- } else if (current_variable->locations.size != 0) {
- s_mc_location_t location;
- mc_dwarf_resolve_locations(
- &location, ¤t_variable->locations,
- current_variable->object_info,
- &(stack_frame->unw_cursor),
- (void *) stack_frame->frame_base,
- (mc_address_space_t) &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:
+ s_local_variable_t new_var;
+ new_var.subprogram = stack_frame->frame;
+ new_var.ip = stack_frame->ip;
+ new_var.name = current_variable.name;
+ new_var.type = current_variable.type;
+ new_var.region = region_type;
+ new_var.address = nullptr;
+
+ if (current_variable.address != NULL) {
+ new_var.address = current_variable.address;
+ } else if (!current_variable.location_list.empty()) {
+ 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");
}
- xbt_dynar_push(result, &new_var);
+ result.push_back(std::move(new_var));
}
// Recursive processing of nested scopes:
- dw_frame_t nested_scope = NULL;
- xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
- mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result);
- }
+ for(simgrid::mc::Frame& nested_scope : scope->scopes)
+ mc_fill_local_variables_values(
+ stack_frame, &nested_scope, process_index, result);
}
-static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index)
+static std::vector<s_local_variable> MC_get_local_variables_values(
+ std::vector<s_mc_stack_frame_t>& stack_frames, int process_index)
{
-
- unsigned cursor1 = 0;
- mc_stack_frame_t stack_frame;
- xbt_dynar_t variables =
- xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp);
-
- xbt_dynar_foreach(stack_frames, cursor1, stack_frame) {
- mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables);
- }
-
- return variables;
+ std::vector<s_local_variable> variables;
+ for (s_mc_stack_frame_t& stack_frame : stack_frames)
+ mc_fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);
+ return std::move(variables);
}
static void MC_stack_frame_free_voipd(void *s)
{
mc_stack_frame_t stack_frame = *(mc_stack_frame_t *) s;
- if (stack_frame) {
- xbt_free(stack_frame->frame_name);
- xbt_free(stack_frame);
- }
+ delete(stack_frame);
}
-static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context)
+static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t stack_context)
{
- mc_process_t process = &mc_model_checker->process();
- xbt_dynar_t result =
- xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd);
+ simgrid::mc::Process* process = &mc_model_checker->process();
+ std::vector<s_mc_stack_frame_t> result;
unw_cursor_t c;
} else
while (1) {
- mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
- xbt_dynar_push(result, &stack_frame);
+ s_mc_stack_frame_t stack_frame;
- stack_frame->unw_cursor = c;
+ stack_frame.unw_cursor = c;
unw_word_t ip, sp;
unw_get_reg(&c, UNW_REG_IP, &ip);
unw_get_reg(&c, UNW_REG_SP, &sp);
- stack_frame->ip = ip;
- stack_frame->sp = sp;
+ stack_frame.ip = ip;
+ stack_frame.sp = sp;
// TODO, use real addresses in frame_t instead of fixing it here
- dw_frame_t frame = MC_process_find_function(process, (void *) ip);
- stack_frame->frame = frame;
+ simgrid::mc::Frame* frame = process->find_function(remote(ip));
+ stack_frame.frame = frame;
if (frame) {
- stack_frame->frame_name = xbt_strdup(frame->name);
- stack_frame->frame_base =
- (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c);
+ stack_frame.frame_name = frame->name;
+ stack_frame.frame_base =
+ (unw_word_t) frame->frame_base(c);
} else {
- stack_frame->frame_base = 0;
- stack_frame->frame_name = NULL;
+ stack_frame.frame_base = 0;
+ stack_frame.frame_name = std::string();
}
+ result.push_back(std::move(stack_frame));
+
/* Stop before context switch with maestro */
- if (frame != NULL && frame->name != NULL
- && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
+ if (frame != nullptr &&
+ frame->name == "smx_ctx_sysv_wrapper")
break;
int ret = unw_step(&c);
}
}
- if (xbt_dynar_length(result) == 0) {
+ if (result.empty()) {
XBT_INFO("unw_init_local failed");
xbt_abort();
}
- return result;
+ return std::move(result);
};
-static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
+static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
{
-
- xbt_dynar_t res =
- xbt_dynar_new(sizeof(s_mc_snapshot_stack_t),
- MC_snapshot_stack_free_voidp);
+ 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) {
- mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1);
+ s_mc_snapshot_stack_t st;
// Read the context from remote process:
unw_context_t context;
- MC_process_read_simple(&mc_model_checker->process(),
- &context, (unw_context_t*) current_stack->context, sizeof(context));
+ mc_model_checker->process().read_bytes(
+ &context, sizeof(context), remote(current_stack->context));
- st->context = xbt_new0(s_mc_unw_context_t, 1);
- if (mc_unw_init_context(st->context, &mc_model_checker->process(),
+ 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->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;
+ unw_word_t sp = st.stack_frames[0].sp;
- unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
+ res.push_back(std::move(st));
- xbt_dynar_push(res, &st);
- (*snapshot)->stack_sizes = (size_t*)
- xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
- (*snapshot)->stack_sizes[cursor] =
+ size_t stack_size =
(char*) current_stack->address + current_stack->size - (char*) sp;
+ (*snapshot)->stack_sizes.push_back(stack_size);
}
- return res;
+ return std::move(res);
}
-static xbt_dynar_t MC_take_snapshot_ignore()
+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 NULL;
-
- xbt_dynar_t cpy =
- xbt_dynar_new(sizeof(mc_heap_ignore_region_t),
- heap_ignore_region_free_voidp);
+ 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) {
- mc_heap_ignore_region_t new_region = NULL;
- new_region = xbt_new0(s_mc_heap_ignore_region_t, 1);
- new_region->address = current_region->address;
- new_region->size = current_region->size;
- new_region->block = current_region->block;
- new_region->fragment = current_region->fragment;
- xbt_dynar_push(cpy, &new_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 cpy;
-
-}
-
-static void mc_free_snapshot_ignored_data_pvoid(void* data) {
- mc_snapshot_ignored_data_t ignored_data = (mc_snapshot_ignored_data_t) data;
- free(ignored_data->data);
+ return std::move(res);
}
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
- xbt_assert(snapshot->process);
- snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
-
+ xbt_assert(snapshot->process());
+
// Copy the memory:
- unsigned int cursor = 0;
- mc_checkpoint_ignore_region_t region;
- xbt_dynar_foreach (mc_model_checker->process().checkpoint_ignore, cursor, region) {
+ for (auto const& region : mc_model_checker->process().ignored_regions()) {
s_mc_snapshot_ignored_data_t ignored_data;
- ignored_data.start = region->addr;
- ignored_data.size = region->size;
- ignored_data.data = malloc(region->size);
+ ignored_data.start = (void*)region.addr;
+ ignored_data.data.resize(region.size);
// TODO, we should do this once per privatization segment:
- MC_process_read(snapshot->process,
- MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- ignored_data.data, region->addr, region->size, MC_PROCESS_INDEX_DISABLED);
- xbt_dynar_push(snapshot->ignored_data, &ignored_data);
+ 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:
- xbt_dynar_foreach (mc_model_checker->process().checkpoint_ignore, cursor, region) {
- MC_process_clear_memory(snapshot->process, region->addr, region->size);
+ for(auto const& region : mc_model_checker->process().ignored_regions()) {
+ snapshot->process()->clear_bytes(remote(region.addr), region.size);
}
}
static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
{
- unsigned int cursor = 0;
- s_mc_snapshot_ignored_data_t ignored_data;
- xbt_dynar_foreach (snapshot->ignored_data, cursor, ignored_data) {
- MC_process_write(snapshot->process,
- ignored_data.data, ignored_data.start, ignored_data.size);
- }
+ for (auto const& ignored_data : snapshot->ignored_data)
+ snapshot->process()->write_bytes(
+ ignored_data.data.data(), ignored_data.data.size(),
+ remote(ignored_data.start));
}
-static void MC_get_current_fd(mc_snapshot_t snapshot)
+static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
{
-
- snapshot->total_fd = 0;
-
const size_t fd_dir_path_size = 20;
char fd_dir_path[fd_dir_path_size];
int res = snprintf(fd_dir_path, fd_dir_path_size,
- "/proc/%lli/fd", (long long int) snapshot->process->pid);
+ "/proc/%lli/fd", (long long int) pid);
xbt_assert(res >= 0);
if ((size_t) res > fd_dir_path_size)
xbt_die("Unexpected buffer is too small for fd_dir_path");
if (fd_dir == NULL)
xbt_die("Cannot open directory '/proc/self/fd'\n");
- size_t total_fd = 0;
+ std::vector<s_fd_infos_t> fds;
+
struct dirent* fd_number;
while ((fd_number = readdir(fd_dir))) {
const size_t source_size = 25;
char source[25];
int res = snprintf(source, source_size, "/proc/%lli/fd/%s",
- (long long int) snapshot->process->pid, fd_number->d_name);
+ (long long int) pid, fd_number->d_name);
xbt_assert(res >= 0);
if ((size_t) res > source_size)
xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name);
}
link[res] = '\0';
+#ifdef HAVE_SMPI
if(smpi_is_privatisation_file(link))
continue;
+#endif
// This is (probably) the DIR* we are reading:
// TODO, read all the file entries at once and close the DIR.*
continue;
// Add an entry for this FD in the snapshot:
- fd_infos_t fd = xbt_new0(s_fd_infos_t, 1);
- fd->filename = strdup(link);
- fd->number = fd_value;
- fd->flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
- fd->current_position = lseek(fd_value, 0, SEEK_CUR);
- snapshot->current_fd = (fd_infos_t*) xbt_realloc(snapshot->current_fd, (total_fd + 1) * sizeof(fd_infos_t));
- snapshot->current_fd[total_fd] = fd;
- total_fd++;
+ s_fd_infos_t fd;
+ fd.filename = std::string(link);
+ fd.number = fd_value;
+ fd.flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
+ fd.current_position = lseek(fd_value, 0, SEEK_CUR);
+ fds.push_back(std::move(fd));
}
- snapshot->total_fd = total_fd;
closedir (fd_dir);
+ return std::move(fds);
}
-static s_mc_address_space_class_t mc_snapshot_class = {
- (mc_address_space_class_read_callback_t) &MC_snapshot_read,
- NULL
-};
-
mc_snapshot_t MC_take_snapshot(int num_state)
{
XBT_DEBUG("Taking snapshot %i", num_state);
- mc_process_t mc_process = &mc_model_checker->process();
- mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1);
- snapshot->process = mc_process;
- snapshot->num_state = num_state;
- snapshot->address_space.address_space_class = &mc_snapshot_class;
+ simgrid::mc::Process* mc_process = &mc_model_checker->process();
- snapshot->enabled_processes = xbt_dynar_new(sizeof(int), NULL);
+ mc_snapshot_t snapshot = new simgrid::mc::Snapshot(mc_process);
+
+ snapshot->num_state = num_state;
smx_process_t process;
MC_EACH_SIMIX_PROCESS(process,
- xbt_dynar_push_as(snapshot->enabled_processes, int, (int)process->pid));
+ snapshot->enabled_processes.insert(process->pid));
MC_snapshot_handle_ignore(snapshot);
if (_sg_mc_snapshot_fds)
- MC_get_current_fd(snapshot);
+ snapshot->current_fds = MC_get_current_fds(process->pid);
+
+ const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;
/* Save the std heap and the writable mapped pages of libsimgrid and binary */
MC_get_memory_regions(mc_process, snapshot);
+ if (use_soft_dirty)
+ mc_process->reset_soft_dirty();
snapshot->to_ignore = MC_take_snapshot_ignore();
if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks =
MC_take_snapshot_stacks(&snapshot);
- if (_sg_mc_hash && snapshot->stacks != NULL) {
- snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks);
+ if (_sg_mc_hash) {
+ snapshot->hash = simgrid::mc::hash(*snapshot);
} else {
snapshot->hash = 0;
}
}
MC_snapshot_ignore_restore(snapshot);
+ if (use_soft_dirty)
+ mc_model_checker->parent_snapshot_ = snapshot;
return snapshot;
}
static inline
void MC_restore_snapshot_regions(mc_snapshot_t snapshot)
{
- const size_t n = snapshot->snapshot_regions_count;
- for (size_t i = 0; i < n; i++) {
+ for(std::unique_ptr<s_mc_mem_region_t> const& region : snapshot->snapshot_regions) {
// For privatized, variables we decided it was not necessary to take the snapshot:
- if (snapshot->snapshot_regions[i])
- MC_region_restore(snapshot->snapshot_regions[i]);
+ if (region)
+ MC_region_restore(region.get());
}
#ifdef HAVE_SMPI
if (mc_mode == MC_MODE_SERVER)
xbt_die("FD snapshot not implemented in client/server mode.");
- int new_fd;
- for (int i=0; i < snapshot->total_fd; i++) {
+ for (auto const& fd : snapshot->current_fds) {
- new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags);
- if (new_fd <0) {
+ int new_fd = open(fd.filename.c_str(), fd.flags);
+ if (new_fd < 0) {
xbt_die("Could not reopen the file %s fo restoring the file descriptor",
- snapshot->current_fd[i]->filename);
+ fd.filename.c_str());
}
- if(new_fd != -1 && new_fd != snapshot->current_fd[i]->number){
- dup2(new_fd, snapshot->current_fd[i]->number);
- //fprintf(stderr, "%p\n", fdopen(snapshot->current_fd[i]->number, "rw"));
+ if (new_fd != fd.number) {
+ dup2(new_fd, fd.number);
close(new_fd);
};
- lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET);
+ lseek(fd.number, fd.current_position, SEEK_SET);
}
}
void MC_restore_snapshot(mc_snapshot_t snapshot)
{
XBT_DEBUG("Restore snapshot %i", snapshot->num_state);
+ const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;
MC_restore_snapshot_regions(snapshot);
if (_sg_mc_snapshot_fds)
MC_restore_snapshot_fds(snapshot);
+ if (use_soft_dirty)
+ mc_model_checker->process().reset_soft_dirty();
MC_snapshot_ignore_restore(snapshot);
mc_model_checker->process().cache_flags = 0;
+ if (use_soft_dirty)
+ mc_model_checker->parent_snapshot_ = snapshot;
}
mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
