#include <sys/types.h>
#include "simgrid_config.h"
-
#include <sys/types.h>
#include <xbt/mmalloc.h>
+
+#ifdef HAVE_MC
#include "xbt/mmalloc/mmprivate.h"
+#endif
+#include <simgrid/simix.h>
#include "simix/popping_private.h"
#include "simix/smx_private.h"
#include "mc_forward.h"
+#include "mc_base.h"
#include "mc_mmalloc.h" // std_heap
#include "mc_memory_map.h"
-#include "mc_address_space.h"
+#include "AddressSpace.hpp"
#include "mc_protocol.h"
-SG_BEGIN_DECL()
-
-int MC_process_vm_open(pid_t pid, int flags);
-
-typedef enum {
- MC_PROCESS_NO_FLAG = 0,
- MC_PROCESS_SELF_FLAG = 1,
-} e_mc_process_flags_t;
+typedef int mc_process_flags_t;
+#define MC_PROCESS_NO_FLAG 0
+#define MC_PROCESS_SELF_FLAG 1
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
-typedef enum {
- MC_PROCESS_CACHE_FLAG_HEAP = 1,
- MC_PROCESS_CACHE_FLAG_MALLOC_INFO = 2,
- MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES = 4,
-} e_mc_process_cache_flags_t ;
-
-struct s_mc_smx_process_info {
- void* address;
- struct s_smx_process copy;
-};
+typedef int mc_process_cache_flags_t;
+#define MC_PROCESS_CACHE_FLAG_NONE 0
+#define MC_PROCESS_CACHE_FLAG_HEAP 1
+#define MC_PROCESS_CACHE_FLAG_MALLOC_INFO 2
+#define MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES 4
typedef struct s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_info_t;
+namespace simgrid {
+namespace mc {
+
/** Representation of a process
*/
-struct s_mc_process {
- s_mc_address_space_t address_space;
- e_mc_process_flags_t process_flags;
+class Process : public AddressSpace {
+public:
+ Process(pid_t pid, int sockfd);
+ ~Process();
+ const void* read_bytes(void* buffer, std::size_t size,
+ std::uint64_t address, int process_index = ProcessIndexAny,
+ ReadMode mode = Normal) override;
+public: // to be private
+ mc_process_flags_t process_flags;
pid_t pid;
int socket;
int status;
size_t object_infos_size;
int memory_file;
+ /** Copy of `simix_global->process_list`
+ *
+ * See mc_smx.c.
+ */
xbt_dynar_t smx_process_infos;
+
+ /** Copy of `simix_global->process_to_destroy`
+ *
+ * See mc_smx.c.
+ */
xbt_dynar_t smx_old_process_infos;
/** State of the cache (which variables are up to date) */
- e_mc_process_cache_flags_t cache_flags;
+ mc_process_cache_flags_t cache_flags;
/** Address of the heap structure in the MCed process. */
void* heap_address;
xbt_dynar_t checkpoint_ignore;
};
-bool MC_is_process(mc_address_space_t p);
+}
+}
-void MC_process_init(mc_process_t process, pid_t pid, int sockfd);
-void MC_process_clear(mc_process_t process);
+SG_BEGIN_DECL()
+
+int MC_process_vm_open(pid_t pid, int flags);
/** Refresh the information about the process
*
* Do not use direclty, this is used by the getters when appropriate
* in order to have fresh data.
*/
-void MC_process_refresh_heap(mc_process_t process);
+XBT_INTERNAL void MC_process_refresh_heap(mc_process_t process);
/** Refresh the information about the process
*
* Do not use direclty, this is used by the getters when appropriate
* in order to have fresh data.
* */
-void MC_process_refresh_malloc_info(mc_process_t process);
-
-void MC_process_refresh_simix_processes(mc_process_t process);
+XBT_INTERNAL void MC_process_refresh_malloc_info(mc_process_t process);
static inline
bool MC_process_is_self(mc_process_t process)
/* Process memory access: */
-/** Read data from a process memory
- *
- * @param process the process
- * @param local local memory address (destination)
- * @param remote target process memory address (source)
- * @param len data size
- */
+static inline
const void* MC_process_read(mc_process_t process,
- e_adress_space_read_flags_t flags,
+ simgrid::mc::AddressSpace::ReadMode mode,
void* local, const void* remote, size_t len,
- int process_index);
+ int process_index)
+{
+ return process->read_bytes(local, len, (std::uint64_t)remote, process_index, mode);
+}
+
+// Simplified versions/wrappers (whould be moved in mc_address_space):
+XBT_INTERNAL const void* MC_process_read_simple(mc_process_t process,
+ void* local, const void* remote, size_t len);
+XBT_INTERNAL const void* MC_process_read_dynar_element(mc_process_t process,
+ void* local, const void* remote_dynar, size_t i, size_t len);
+XBT_INTERNAL unsigned long MC_process_read_dynar_length(mc_process_t process,
+ const void* remote_dynar);
/** Write data to a process memory
*
* @param remote target process memory address (target)
* @param len data size
*/
-void MC_process_write(mc_process_t process, const void* local, void* remote, size_t len);
+XBT_INTERNAL void MC_process_write(mc_process_t process,
+ const void* local, void* remote, size_t len);
-void MC_process_clear_memory(mc_process_t process, void* remote, size_t len);
+XBT_INTERNAL void MC_process_clear_memory(mc_process_t process,
+ void* remote, size_t len);
/* Functions, variables of the process: */
-mc_object_info_t MC_process_find_object_info(mc_process_t process, const void* addr);
-mc_object_info_t MC_process_find_object_info_exec(mc_process_t process, const void* addr);
-mc_object_info_t MC_process_find_object_info_rw(mc_process_t process, const void* addr);
+XBT_INTERNAL mc_object_info_t MC_process_find_object_info(mc_process_t process, const void* addr);
+XBT_INTERNAL mc_object_info_t MC_process_find_object_info_exec(mc_process_t process, const void* addr);
+XBT_INTERNAL mc_object_info_t MC_process_find_object_info_rw(mc_process_t process, const void* addr);
-dw_frame_t MC_process_find_function(mc_process_t process, const void* ip);
+XBT_INTERNAL dw_frame_t MC_process_find_function(mc_process_t process, const void* ip);
-void MC_process_read_variable(mc_process_t process, const char* name, void* target, size_t size);
+XBT_INTERNAL void MC_process_read_variable(mc_process_t process, const char* name, void* target, size_t size);
+XBT_INTERNAL char* MC_process_read_string(mc_process_t, void* address);
static inline xbt_mheap_t MC_process_get_heap(mc_process_t process)
{
- if (MC_process_is_self(process))
- return std_heap;
if (!(process->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
MC_process_refresh_heap(process);
return process->heap;
static inline malloc_info* MC_process_get_malloc_info(mc_process_t process)
{
- if (MC_process_is_self(process))
- return std_heap->heapinfo;
if (!(process->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO))
MC_process_refresh_malloc_info(process);
return process->heap_info;
/** Find (one occurence of) the named variable definition
*/
-dw_variable_t MC_process_find_variable_by_name(mc_process_t process, const char* name);
-
-// ***** Things to move somewhere else:
-
-smx_process_t MC_process_get_issuer(mc_process_t process, smx_simcall_t req);
-
-void MC_simcall_handle(smx_simcall_t req, int value);
+XBT_INTERNAL dw_variable_t MC_process_find_variable_by_name(mc_process_t process, const char* name);
-void mc_smx_process_info_clear(mc_smx_process_info_t p);
-
-static inline
-xbt_dynar_t mc_smx_process_info_list_new()
-{
- return xbt_dynar_new(
- sizeof(s_mc_smx_process_info_t), (void_f_pvoid_t) &mc_smx_process_info_clear);
-}
+XBT_INTERNAL void MC_invalidate_cache(void);
SG_END_DECL()