X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1679193978528bbb628e0f3a7853cddf4f3cfe0d..61ab70f5ec5869d57fb0712101280e304d38dcbc:/src/mc/Process.hpp diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp index d5ff78233f..23d262081e 100644 --- a/src/mc/Process.hpp +++ b/src/mc/Process.hpp @@ -74,13 +74,13 @@ struct IgnoredHeapRegion { /** Representation of a process * - * This class is mixing a lot of different responsabilities and is tied + * 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; @@ -109,15 +109,20 @@ 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; } + std::string read_string(RemotePtr address) const; std::string read_string(RemotePtr address, std::size_t len) const { @@ -318,7 +323,7 @@ public: // Libunwind-data */ 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