-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#ifndef MC_PROCESS_H
-#define MC_PROCESS_H
+#ifndef SIMGRID_MC_PROCESS_H
+#define SIMGRID_MC_PROCESS_H
#include <type_traits>
#include "simgrid_config.h"
#include <sys/types.h>
+#include <xbt/base.h>
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
#include "simix/popping_private.h"
#include "simix/smx_private.h"
-#include "mc_forward.h"
+#include "mc_forward.hpp"
#include "mc_base.h"
#include "mc_mmalloc.h" // std_heap
#include "mc_memory_map.h"
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index = ProcessIndexAny,
- ReadMode mode = Normal) const MC_OVERRIDE;
+ ReadMode mode = Normal) const override;
void read_variable(const char* name, void* target, size_t size) const;
template<class T>
T read_variable(const char *name) const
void clear_bytes(remote_ptr<void> address, size_t len);
// Debug information:
- std::shared_ptr<s_mc_object_info_t> find_object_info(remote_ptr<void> addr) const;
- std::shared_ptr<s_mc_object_info_t> find_object_info_exec(remote_ptr<void> addr) const;
- std::shared_ptr<s_mc_object_info_t> find_object_info_rw(remote_ptr<void> addr) const;
- dw_frame_t find_function(remote_ptr<void> ip) const;
- dw_variable_t find_variable(const char* name) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(remote_ptr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(remote_ptr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(remote_ptr<void> addr) const;
+ simgrid::mc::Frame* find_function(remote_ptr<void> ip) const;
+ simgrid::mc::Variable* find_variable(const char* name) const;
// Heap access:
xbt_mheap_t get_heap()
return MC_receive_message(this->socket_, &m, sizeof(M), 0);
}
+ void reset_soft_dirty();
+ void read_pagemap(uint64_t* pagemap, size_t start_page, size_t page_count);
+
private:
void init_memory_map_info();
void refresh_heap();
remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
int memory_file;
std::vector<IgnoredRegion> ignored_regions_;
-
+ int clear_refs_fd_;
+ int pagemap_fd_;
public: // object info
- // TODO, make private (first, objectify mc_object_info_t)
- std::vector<std::shared_ptr<s_mc_object_info_t>> object_infos;
- std::shared_ptr<s_mc_object_info_t> libsimgrid_info;
- std::shared_ptr<s_mc_object_info_t> binary_info;
+ // TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
+ std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
+ std::shared_ptr<simgrid::mc::ObjectInformation> libsimgrid_info;
+ std::shared_ptr<simgrid::mc::ObjectInformation> binary_info;
public: // Copies of MCed SMX data structures
/** Copy of `simix_global->process_list`
/** Full-featured MC-aware libunwind address space for the process
*
* This address space is using a mc_unw_context_t
- * (with mc_process_t/mc_address_space_t and unw_context_t).
+ * (with simgrid::mc::Process* / simgrid::mc::AddressSpace*
+ * and unw_context_t).
*/
unw_addr_space_t unw_addr_space;
/** Open a FD to a remote process memory (`/dev/$pid/mem`)
*/
-int open_vm(pid_t pid, int flags);
+XBT_PRIVATE int open_vm(pid_t pid, int flags);
}
}
SG_BEGIN_DECL()
-XBT_INTERNAL void MC_invalidate_cache(void);
+XBT_PRIVATE void MC_invalidate_cache(void);
SG_END_DECL()