#ifndef SIMGRID_MC_PROCESS_H
#define SIMGRID_MC_PROCESS_H
-#include <type_traits>
-
-#include <sys/types.h>
+#include <cstdint>
+#include <cstddef>
+#include <type_traits>
#include <vector>
#include <memory>
-#include "simgrid_config.h"
#include <sys/types.h>
+#include <simgrid_config.h>
+
#include <xbt/base.h>
+#include <xbt/dynar.h>
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
#endif
#include <simgrid/simix.h>
-#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"
-#include "mc_mmalloc.h" // std_heap
-#include "mc_memory_map.h"
-#include "AddressSpace.hpp"
-#include "mc_protocol.h"
+#include "src/xbt/memory_map.hpp"
+
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_base.h"
+#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.
struct IgnoredRegion {
std::uint64_t addr;
- size_t size;
+ std::size_t size;
+};
+
+struct IgnoredHeapRegion {
+ int block;
+ int fragment;
+ void *address;
+ std::size_t size;
};
/** Representation of a process
public:
Process(pid_t pid, int sockfd);
~Process();
+ void init();
Process(Process const&) = delete;
Process(Process &&) = delete;
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
- remote_ptr<void> address, int process_index = ProcessIndexAny,
- ReadMode mode = Normal) const override;
+ RemotePtr<void> address, int process_index = ProcessIndexAny,
+ ReadOptions options = ReadOptions::none()) const override;
void read_variable(const char* name, void* target, size_t size) const;
template<class T>
T read_variable(const char *name) const
read_variable(name, &res, sizeof(T));
return res;
}
- char* read_string(remote_ptr<void> address) const;
+ char* read_string(RemotePtr<void> address) const;
// Write memory:
- void write_bytes(const void* buffer, size_t len, remote_ptr<void> address);
- void clear_bytes(remote_ptr<void> address, size_t len);
+ void write_bytes(const void* buffer, size_t len, RemotePtr<void> address);
+ void clear_bytes(RemotePtr<void> address, size_t len);
// Debug information:
- 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;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(RemotePtr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(RemotePtr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(RemotePtr<void> addr) const;
+ simgrid::mc::Frame* find_function(RemotePtr<void> ip) const;
simgrid::mc::Variable* find_variable(const char* name) const;
// Heap access:
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
this->refresh_heap();
- return this->heap;
+ return this->heap.get();
}
malloc_info* get_malloc_info()
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO))
this->refresh_malloc_info();
- return this->heap_info;
+ return this->heap_info.data();
}
std::vector<IgnoredRegion> const& ignored_regions() const
pid_t pid() const { return pid_; }
- bool in_maestro_stack(remote_ptr<void> p) const
+ bool in_maestro_stack(RemotePtr<void> p) const
{
return p >= this->maestro_stack_start_ && p < this->maestro_stack_end_;
}
return running_;
}
- void terminate(int status)
+ void terminate()
{
- status_ = status;
running_ = false;
}
- int status() const
- {
- return status_;
- }
-
template<class M>
typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
send_message(M const& m)
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();
+ }
+ bool privatized() const
+ {
+ return privatized_;
+ }
+ void privatized(bool privatized) { privatized_ = privatized; }
+
+ void ignore_global_variable(const char* name)
+ {
+ for (std::shared_ptr<simgrid::mc::ObjectInformation> const& info :
+ this->object_infos)
+ info->remove_global_variable(name);
+ }
+
+ std::vector<s_stack_region_t>& stack_areas()
+ {
+ return stack_areas_;
+ }
+ std::vector<s_stack_region_t> const& stack_areas() const
+ {
+ return stack_areas_;
+ }
+
+ std::vector<IgnoredHeapRegion> const& ignored_heap() const
+ {
+ return ignored_heap_;
+ }
+ void ignore_heap(IgnoredHeapRegion const& region);
+ void unignore_heap(void *address, size_t size);
+
+ void ignore_local_variable(const char *var_name, const char *frame_name);
+ int socket() { return socket_; }
+
private:
void init_memory_map_info();
void refresh_heap();
void refresh_malloc_info();
+
private:
- pid_t pid_;
- int socket_;
- int status_;
- bool running_;
- std::vector<VmMap> memory_map_;
- remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
- int memory_file;
+ pid_t pid_ = -1;
+ int socket_ = -1;
+ bool running_ = false;
+ std::vector<simgrid::xbt::VmMap> memory_map_;
+ RemotePtr<void> maestro_stack_start_, maestro_stack_end_;
+ int memory_file = -1;
std::vector<IgnoredRegion> ignored_regions_;
- int clear_refs_fd_;
- int pagemap_fd_;
+ int clear_refs_fd_ = -1;
+ int pagemap_fd_ = -1;
+ bool privatized_ = false;
+ std::vector<s_stack_region_t> stack_areas_;
+ std::vector<IgnoredHeapRegion> ignored_heap_;
+
public: // object info
// TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_process_infos;
+ xbt_dynar_t smx_process_infos = nullptr;
/** Copy of `simix_global->process_to_destroy`
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_old_process_infos;
+ xbt_dynar_t smx_old_process_infos = nullptr;
/** State of the cache (which variables are up to date) */
- mc_process_cache_flags_t cache_flags;
+ mc_process_cache_flags_t cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
/** Address of the heap structure in the MCed process. */
void* heap_address;
* 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<s_xbt_mheap_t> heap;
/** Copy of the allocation info structure
*
* This is not used if the process is the current one:
* use `get_malloc_info()` in order to use it.
*/
- malloc_info* heap_info;
+ std::vector<malloc_info> heap_info;
public: // Libunwind-data
}
}
-SG_BEGIN_DECL()
-
-XBT_PRIVATE void MC_invalidate_cache(void);
-
-SG_END_DECL()
-
#endif
