X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19c58cbb49a4c58174169566b13aafb2b873fd81..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/mc/Process.hpp diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp index 36ef9944e3..97787020e0 100644 --- a/src/mc/Process.hpp +++ b/src/mc/Process.hpp @@ -13,13 +13,13 @@ #include #include #include +#include #include #include #include -#include #include #include "src/xbt/mmalloc/mmprivate.h" @@ -33,17 +33,11 @@ #include "src/mc/mc_forward.hpp" #include "src/mc/mc_base.h" +#include "src/mc/RemotePtr.hpp" #include "src/mc/AddressSpace.hpp" #include "src/mc/mc_protocol.h" #include "src/mc/ObjectInformation.hpp" -// Those flags are used to track down which cached information -// is still up to date and which information needs to be updated. -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 namespace simgrid { namespace mc { @@ -51,11 +45,9 @@ namespace mc { class SimixProcessInformation { public: /** MCed address of the process */ - void* address = nullptr; - union { - /** (Flat) Copy of the process data structure */ - struct s_smx_process copy; - }; + RemotePtr address = nullptr; + Remote copy; + /** Hostname (owned by `mc_modelchecker->hostnames`) */ const char* hostname = nullptr; std::string name; @@ -82,13 +74,13 @@ struct IgnoredHeapRegion { /** Representation of a process * - * This class is mixing a lot of differents responsabilities and is tied - * to SIMIX. It should probably split into different classes. + * This class is mixing a lot of different responsibilities and is tied + * to SIMIX. It should probably be split into different classes. * - * Responsabilities: + * Responsibilities: * * - reading from the process memory (`AddressSpace`); - * - accessing the system state of the porcess (heap, …); + * - accessing the system state of the process (heap, …); * - storing the SIMIX state of the process; * - privatization; * - communication with the model-checked process; @@ -96,6 +88,13 @@ struct IgnoredHeapRegion { * - etc. */ class Process final : public AddressSpace { +private: + // Those flags are used to track down which cached information + // is still up to date and which information needs to be updated. + static constexpr int cache_none = 0; + static constexpr int cache_heap = 1; + static constexpr int cache_malloc = 2; + static constexpr int cache_simix_processes = 4; public: Process(pid_t pid, int sockfd); ~Process(); @@ -110,16 +109,25 @@ public: const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, ReadOptions options = ReadOptions::none()) const override; + void read_variable(const char* name, void* target, size_t size) const; + template void read_variable(const char* name, T* target) const + { + read_variable(name, target, sizeof(*target)); + } template - T read_variable(const char *name) const + Remote read_variable(const char *name) const { - static_assert(std::is_trivial::value, "Cannot read a non-trivial type"); - T res; - read_variable(name, &res, sizeof(T)); + Remote res; + read_variable(name, res.getBuffer(), sizeof(T)); return res; } - char* read_string(RemotePtr address) const; + + std::string read_string(RemotePtr address) const; + std::string read_string(RemotePtr address, std::size_t len) const + { + return AddressSpace::read_string(address, len); + } // Write memory: void write_bytes(const void* buffer, size_t len, RemotePtr address); @@ -135,16 +143,21 @@ public: // Heap access: xbt_mheap_t get_heap() { - if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP)) + if (!(this->cache_flags_ & Process::cache_heap)) this->refresh_heap(); return this->heap.get(); } malloc_info* get_malloc_info() { - if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO)) + if (!(this->cache_flags_ & Process::cache_malloc)) this->refresh_malloc_info(); return this->heap_info.data(); } + + void clear_cache() + { + this->cache_flags_ = Process::cache_none; + } Channel const& getChannel() const { return channel_; } Channel& getChannel() { return channel_; } @@ -172,9 +185,6 @@ public: running_ = false; } - void reset_soft_dirty(); - void read_pagemap(uint64_t* pagemap, size_t start_page, size_t page_count); - bool privatized(ObjectInformation const& info) const { return privatized_ && info.executable(); @@ -212,6 +222,36 @@ public: std::vector& simix_processes(); std::vector& old_simix_processes(); + /** Get a local description of a remote SIMIX process */ + simgrid::mc::SimixProcessInformation* resolveProcessInfo( + simgrid::mc::RemotePtr process) + { + xbt_assert(mc_model_checker != nullptr); + if (!process) + return nullptr; + this->refresh_simix(); + for (auto& process_info : this->smx_process_infos) + if (process_info.address == process) + return &process_info; + for (auto& process_info : this->smx_old_process_infos) + if (process_info.address == process) + return &process_info; + return nullptr; + } + + /** Get a local copy of the SIMIX process structure */ + simgrid::simix::ActorImpl* resolveProcess(simgrid::mc::RemotePtr process) + { + simgrid::mc::SimixProcessInformation* process_info = + this->resolveProcessInfo(process); + if (process_info) + return process_info->copy.getBuffer(); + else + return nullptr; + } + + void dumpStack(); + private: void init_memory_map_info(); void refresh_heap(); @@ -226,8 +266,6 @@ private: RemotePtr maestro_stack_start_, maestro_stack_end_; int memory_file = -1; std::vector ignored_regions_; - int clear_refs_fd_ = -1; - int pagemap_fd_ = -1; bool privatized_ = false; std::vector stack_areas_; std::vector ignored_heap_; @@ -251,9 +289,11 @@ public: // Copies of MCed SMX data structures */ std::vector smx_old_process_infos; +private: /** State of the cache (which variables are up to date) */ - mc_process_cache_flags_t cache_flags = MC_PROCESS_CACHE_FLAG_NONE; + int cache_flags_ = Process::cache_none; +public: /** Address of the heap structure in the MCed process. */ void* heap_address; @@ -277,13 +317,13 @@ public: // Libunwind-data /** Full-featured MC-aware libunwind address space for the process * - * This address space is using a mc_unw_context_t + * This address space is using a simgrid::mc::UnwindContext* * (with simgrid::mc::Process* / simgrid::mc::AddressSpace* * and unw_context_t). */ unw_addr_space_t unw_addr_space; - /** Underlying libunwind addres-space + /** Underlying libunwind address-space * * The `find_proc_info`, `put_unwind_info`, `get_dyn_info_list_addr` * operations of the native MC address space is currently delegated