X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6981f90a3edb416f81749556217e0cce13f4459..31fdb2a73f84ad56d97facc52298766e4b6aed33:/src/mc/Process.hpp diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp index 71e63e29a5..f6b941a7f8 100644 --- a/src/mc/Process.hpp +++ b/src/mc/Process.hpp @@ -21,12 +21,12 @@ #include #ifdef HAVE_MC -#include "xbt/mmalloc/mmprivate.h" +#include "src/xbt/mmalloc/mmprivate.h" #endif #include -#include "simix/popping_private.h" -#include "simix/smx_private.h" +#include "src/simix/popping_private.h" +#include "src/simix/smx_private.h" #include "mc_forward.hpp" #include "mc_base.h" @@ -53,11 +53,16 @@ struct IgnoredRegion { /** Representation of a process */ -class Process : public AddressSpace { +class Process final : public AddressSpace { public: Process(pid_t pid, int sockfd); ~Process(); + Process(Process const&) = delete; + Process(Process &&) = delete; + Process& operator=(Process const&) = delete; + Process& operator=(Process &&) = delete; + // Read memory: const void* read_bytes(void* buffer, std::size_t size, remote_ptr address, int process_index = ProcessIndexAny, @@ -89,7 +94,7 @@ public: { if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP)) this->refresh_heap(); - return this->heap; + return this->heap.get(); } malloc_info* get_malloc_info() { @@ -195,7 +200,7 @@ public: // Copies of MCed SMX data structures * This is not used if the process is the current one: * use `get_heap_info()` in order to use it. */ - xbt_mheap_t heap; + std::unique_ptr heap; /** Copy of the allocation info structure *