/************************************ Free functions **************************************/
/*****************************************************************************************/
-s_mc_snapshot_stack::~s_mc_snapshot_stack()
-{
- if (this->context)
- mc_unw_destroy_context(this->context);
- xbt_free(this->context);
-}
-
static void MC_snapshot_stack_free_voidp(void *s)
{
mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s;
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.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;
int region;
} s_local_variable_t, *local_variable_t;
-typedef struct s_mc_snapshot_stack{
+typedef struct s_mc_snapshot_stack {
std::vector<s_local_variable> local_variables;
- mc_unw_context_t context;
+ s_mc_unw_context_t context;
std::vector<s_mc_stack_frame_t> stack_frames;
int process_index;
-
- s_mc_snapshot_stack()
- : context(nullptr), process_index(0)
- {}
- ~s_mc_snapshot_stack();
- s_mc_snapshot_stack(s_mc_snapshot_stack& p) = delete;
- s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&) = delete;
-
- s_mc_snapshot_stack(s_mc_snapshot_stack&& that)
- {
- *this = std::move(that);
- }
- s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&& that)
- {
- this->local_variables = std::move(that.local_variables);
- this->context = std::move(that.context);
- that.context = nullptr;
- this->process_index = that.process_index;
- that.process_index = 0;
- return *this;
- }
-
-}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
+} s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
typedef struct s_mc_global_t {
mc_snapshot_t snapshot;
return 0;
}
-int mc_unw_destroy_context(mc_unw_context_t context)
-{
- context->address_space = NULL;
- context->process = NULL;
- return 0;
-}
-
// ***** Cursor management
int mc_unw_init_cursor(unw_cursor_t *cursor, mc_unw_context_t context)
XBT_INTERNAL int mc_unw_init_context(
mc_unw_context_t context, mc_process_t process, unw_context_t* c);
-/** Destroys (but not not `free`) a context */
-XBT_INTERNAL int mc_unw_destroy_context(mc_unw_context_t context);
-
// ***** Libunwind cursor
/** Initialises a `libunwind` cursor */