#include <simgrid_config.h>
#include <xbt/base.h>
+#include <xbt/dynar.h>
#include <xbt/mmalloc.h>
-#ifdef HAVE_MC
#include "src/xbt/mmalloc/mmprivate.h"
-#endif
+#include "src/mc/Channel.hpp"
#include <simgrid/simix.h>
#include "src/simix/popping_private.h"
#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 {
+class SimixProcessInformation {
+public:
+ /** MCed address of the process */
+ void* address = nullptr;
+ union {
+ /** (Flat) Copy of the process data structure */
+ struct s_smx_process copy;
+ };
+ /** Hostname (owned by `mc_modelchecker->hostnames`) */
+ const char* hostname = nullptr;
+ std::string name;
+
+ void clear()
+ {
+ name.clear();
+ address = nullptr;
+ hostname = nullptr;
+ }
+};
+
struct IgnoredRegion {
std::uint64_t addr;
- size_t size;
+ std::size_t size;
};
struct IgnoredHeapRegion {
int block;
int fragment;
void *address;
- size_t size;
+ std::size_t size;
};
/** 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.
+ *
+ * Responsabilities:
+ *
+ * - reading from the process memory (`AddressSpace`);
+ * - accessing the system state of the porcess (heap, …);
+ * - storing the SIMIX state of the process;
+ * - privatization;
+ * - communication with the model-checked process;
+ * - stack unwinding;
+ * - 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();
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
- remote_ptr<void> address, int process_index = ProcessIndexAny,
+ 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>
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:
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_; }
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_;
}
running_ = false;
}
- template<class M>
- typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
- send_message(M const& m)
- {
- return MC_protocol_send(this->socket_, &m, sizeof(M));
- }
-
- int send_message(e_mc_message_type message_id)
- {
- return MC_protocol_send_simple_message(this->socket_, message_id);
- }
-
- template<class M>
- typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, ssize_t >::type
- receive_message(M& m)
- {
- return MC_receive_message(this->socket_, &m, sizeof(M), 0);
- }
-
void reset_soft_dirty();
void read_pagemap(uint64_t* pagemap, size_t start_page, size_t page_count);
void unignore_heap(void *address, size_t size);
void ignore_local_variable(const char *var_name, const char *frame_name);
- int socket() { return socket_; }
+ std::vector<simgrid::mc::SimixProcessInformation>& simix_processes();
+ std::vector<simgrid::mc::SimixProcessInformation>& old_simix_processes();
private:
void init_memory_map_info();
void refresh_heap();
void refresh_malloc_info();
+ void refresh_simix();
private:
pid_t pid_ = -1;
- int socket_ = -1;
+ Channel channel_;
bool running_ = false;
std::vector<simgrid::xbt::VmMap> memory_map_;
- remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
+ RemotePtr<void> maestro_stack_start_, maestro_stack_end_;
int memory_file = -1;
std::vector<IgnoredRegion> ignored_regions_;
int clear_refs_fd_ = -1;
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_process_infos = nullptr;
+ std::vector<SimixProcessInformation> smx_process_infos;
/** Copy of `simix_global->process_to_destroy`
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_old_process_infos = nullptr;
+ std::vector<SimixProcessInformation> 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;
