snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
// 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.size = region.size;
+ ignored_data.data = malloc(region.size);
// TODO, we should do this once per privatization segment:
snapshot->process->read_bytes(
- ignored_data.data, region->size, remote(region->addr),
+ ignored_data.data, region.size, remote(region.addr),
simgrid::mc::ProcessIndexDisabled);
xbt_dynar_push(snapshot->ignored_data, &ignored_data);
}
// Zero the memory:
- xbt_dynar_foreach (mc_model_checker->process().checkpoint_ignore, cursor, region) {
- snapshot->process->clear_bytes(remote(region->addr), region->size);
+ for(auto const& region : mc_model_checker->process().ignored_regions()) {
+ snapshot->process->clear_bytes(remote(region.addr), region.size);
}
}
process->smx_process_infos = MC_smx_process_info_list_new();
process->smx_old_process_infos = MC_smx_process_info_list_new();
- process->checkpoint_ignore = MC_checkpoint_ignore_new();
-
process->unw_addr_space = unw_create_addr_space(&mc_unw_accessors , __BYTE_ORDER);
if (process->process_flags & MC_PROCESS_SELF_FLAG) {
process->unw_underlying_addr_space = unw_local_addr_space;
process->maestro_stack_start = NULL;
process->maestro_stack_end = NULL;
- xbt_dynar_free(&process->checkpoint_ignore);
-
xbt_dynar_free(&process->smx_process_infos);
xbt_dynar_free(&process->smx_old_process_infos);
}
}
+void Process::ignore_region(std::uint64_t addr, std::size_t size)
+{
+ IgnoredRegion region;
+ region.addr = addr;
+ region.size = size;
+
+ if (ignored_regions_.empty()) {
+ ignored_regions_.push_back(region);
+ return;
+ }
+
+ unsigned int cursor = 0;
+ IgnoredRegion* current_region = nullptr;
+
+ int start = 0;
+ int end = ignored_regions_.size() - 1;
+ while (start <= end) {
+ cursor = (start + end) / 2;
+ current_region = &ignored_regions_[cursor];
+ if (current_region->addr == addr) {
+ if (current_region->size == size)
+ return;
+ else if (current_region->size < size)
+ start = cursor + 1;
+ else
+ end = cursor - 1;
+ } else if (current_region->addr < addr)
+ start = cursor + 1;
+ else
+ end = cursor - 1;
+ }
+
+ std::size_t position;
+ if (current_region->addr == addr) {
+ if (current_region->size < size) {
+ position = cursor + 1;
+ } else {
+ position = cursor;
+ }
+ } else if (current_region->addr < addr) {
+ position = cursor + 1;
+ } else {
+ position = cursor;
+ }
+ ignored_regions_.insert(
+ ignored_regions_.begin() + position, region);
+}
+
}
}
#include <stdbool.h>
#include <sys/types.h>
+#include <vector>
+
#include "simgrid_config.h"
#include <sys/types.h>
namespace simgrid {
namespace mc {
+struct IgnoredRegion {
+ std::uint64_t addr;
+ size_t size;
+};
+
/** Representation of a process
*/
class Process : public AddressSpace {
return this->heap_info;
}
+ std::vector<IgnoredRegion> const& ignored_regions() const
+ {
+ return ignored_regions_;
+ }
+ void ignore_region(std::uint64_t address, std::size_t size);
+
private:
void init_memory_map_info();
void refresh_heap();
*/
void* unw_underlying_context;
- xbt_dynar_t checkpoint_ignore;
+private:
+ std::vector<IgnoredRegion> ignored_regions_;
};
/** Open a FD to a remote process memory (`/dev/$pid/mem`)
if (size != sizeof(message))
xbt_die("Broken messsage");
memcpy(&message, buffer, sizeof(message));
- MC_process_ignore_memory(&mc_model_checker->process(),
- message.addr, message.size);
+ mc_model_checker->process().ignore_region(
+ (std::uint64_t)message.addr, message.size);
break;
}
char *recv_diff;
}s_mc_global_t, *mc_global_t;
-typedef struct s_mc_checkpoint_ignore_region{
- void *addr;
- size_t size;
-}s_mc_checkpoint_ignore_region_t, *mc_checkpoint_ignore_region_t;
-
static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state);
}
}
-// ****** Checkpoint ignore:
-
-static void checkpoint_ignore_region_free(mc_checkpoint_ignore_region_t r)
-{
- xbt_free(r);
-}
-
-static void checkpoint_ignore_region_free_voidp(void *r)
-{
- checkpoint_ignore_region_free((mc_checkpoint_ignore_region_t) * (void **) r);
-}
-
-xbt_dynar_t MC_checkpoint_ignore_new(void)
-{
- return xbt_dynar_new(sizeof(mc_checkpoint_ignore_region_t),
- checkpoint_ignore_region_free_voidp);
-}
-
-// ***** Generic memory ignore mechanism
-
-void MC_process_ignore_memory(mc_process_t process, void *addr, size_t size)
-{
- xbt_dynar_t checkpoint_ignore = process->checkpoint_ignore;
- mc_checkpoint_ignore_region_t region =
- xbt_new0(s_mc_checkpoint_ignore_region_t, 1);
- region->addr = addr;
- region->size = size;
-
- if (xbt_dynar_is_empty(checkpoint_ignore)) {
- xbt_dynar_push(checkpoint_ignore, ®ion);
- } else {
-
- unsigned int cursor = 0;
- int start = 0;
- int end = xbt_dynar_length(checkpoint_ignore) - 1;
- mc_checkpoint_ignore_region_t current_region = NULL;
-
- while (start <= end) {
- cursor = (start + end) / 2;
- current_region =
- (mc_checkpoint_ignore_region_t) xbt_dynar_get_as(checkpoint_ignore,
- cursor,
- mc_checkpoint_ignore_region_t);
- if (current_region->addr == addr) {
- if (current_region->size == size) {
- checkpoint_ignore_region_free(region);
- return;
- } else if (current_region->size < size) {
- start = cursor + 1;
- } else {
- end = cursor - 1;
- }
- } else if (current_region->addr < addr) {
- start = cursor + 1;
- } else {
- end = cursor - 1;
- }
- }
-
- if (current_region->addr == addr) {
- if (current_region->size < size) {
- xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, ®ion);
- } else {
- xbt_dynar_insert_at(checkpoint_ignore, cursor, ®ion);
- }
- } else if (current_region->addr < addr) {
- xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, ®ion);
- } else {
- xbt_dynar_insert_at(checkpoint_ignore, cursor, ®ion);
- }
- }
-}
-
extern xbt_dynar_t stacks_areas;
void MC_stack_area_add(stack_region_t stack_area)
XBT_INTERNAL void MCer_ignore_global_variable(const char *var_name);
XBT_INTERNAL void MC_heap_region_ignore_insert(mc_heap_ignore_region_t region);
XBT_INTERNAL void MC_heap_region_ignore_remove(void *address, size_t size);
-XBT_INTERNAL void MC_process_ignore_memory(mc_process_t process, void *addr, size_t size);
SG_END_DECL();