#include <xbt/dynar.h>
#include "mc_forward.h"
-#include "mc_model_checker.h"
-#include "mc_page_store.h"
+#include "ModelChecker.hpp"
+#include "PageStore.hpp"
#include "mc_mmalloc.h"
#include "mc_address_space.h"
+#include "mc_unw.h"
SG_BEGIN_DECL()
-void mc_softdirty_reset(void);
-
// ***** Snapshot region
typedef enum e_mc_region_type_t {
};
-mc_mem_region_t mc_region_new_sparse(mc_region_type_t type, void *start_addr, void* data_addr, size_t size, mc_mem_region_t ref_reg);
+mc_mem_region_t mc_region_new_sparse(
+ mc_region_type_t type, void *start_addr, void* data_addr, size_t size);
void MC_region_destroy(mc_mem_region_t reg);
-void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg, mc_mem_region_t ref_reg);
+void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg);
static inline __attribute__ ((always_inline))
bool mc_region_contain(mc_mem_region_t region, const void* p)
static inline __attribute__((always_inline))
void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region)
{
- size_t pageno = mc_page_number(region->start_addr, (void*) addr);
- size_t snapshot_pageno = region->chunked.page_numbers[pageno];
- const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno);
- return (char*) snapshot_page + mc_page_offset((void*) addr);
+ size_t pageno = mc_page_number(region->start_addr, (void*) addr);
+ size_t snapshot_pageno = region->chunked.page_numbers[pageno];
+ const void* snapshot_page =
+ mc_model_checker->page_store().get_page(snapshot_pageno);
+ return (char*) snapshot_page + mc_page_offset((void*) addr);
}
mc_mem_region_t mc_get_snapshot_region(const void* addr, mc_snapshot_t snapshot, int process_index);
struct s_mc_snapshot {
mc_process_t process;
+ int num_state;
s_mc_address_space_t address_space;
size_t heap_bytes_used;
mc_mem_region_t* snapshot_regions;
typedef struct s_mc_snapshot_stack{
xbt_dynar_t local_variables;
- unw_context_t context;
+ mc_unw_context_t context;
xbt_dynar_t stack_frames; // mc_stack_frame_t
int process_index;
}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
int prev_pair;
char *prev_req;
int initial_communications_pattern_done;
- int comm_deterministic;
+ int recv_deterministic;
int send_deterministic;
+ char *send_diff;
+ char *recv_diff;
}s_mc_global_t, *mc_global_t;
typedef struct s_mc_checkpoint_ignore_region{
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
-int mc_important_snapshot(mc_snapshot_t snapshot);
-
size_t* mc_take_page_snapshot_region(mc_process_t process,
- void* data, size_t page_count, uint64_t* pagemap, size_t* reference_pages);
+ void* data, size_t page_count);
void mc_free_page_snapshot_region(size_t* pagenos, size_t page_count);
void mc_restore_page_snapshot_region(
mc_process_t process,
- void* start_addr, size_t page_count, size_t* pagenos,
- uint64_t* pagemap, size_t* reference_pagenos);
+ void* start_addr, size_t page_count, size_t* pagenos);
const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, const void* addr, size_t size);
-const void* MC_snapshot_read(mc_snapshot_t snapshot, e_adress_space_read_flags_t flags,
+const void* MC_snapshot_read(mc_snapshot_t snapshot, adress_space_read_flags_t flags,
void* target, const void* addr, size_t size, int process_index);
int MC_snapshot_region_memcmp(
const void* addr1, mc_mem_region_t region1,
{
if(snapshot==NULL)
xbt_die("snapshot is NULL");
- // This is &std_heap->breakval in the target process:
- void** addr = &MC_process_get_heap(&mc_model_checker->process)->breakval;
- // Read (std_heap->breakval) in the target process (*addr i.e. std_heap->breakval):
- return MC_snapshot_read_pointer(snapshot, addr, MC_PROCESS_INDEX_ANY);
+ return MC_process_get_heap(&mc_model_checker->process())->breakval;
}
/** @brief Read memory from a snapshot region