X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b08e93079ce626559903d763ea5c79d3de220a24..1de2cea69ed077bfc9b387814f95dc35db3083dc:/src/mc/mc_process.h diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h index 703dd555e7..570d84b68b 100644 --- a/src/mc/mc_process.h +++ b/src/mc/mc_process.h @@ -1,18 +1,23 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifndef MC_PROCESS_H -#define MC_PROCESS_H +#ifndef SIMGRID_MC_PROCESS_H +#define SIMGRID_MC_PROCESS_H + +#include -#include #include +#include +#include + #include "simgrid_config.h" #include +#include #include #ifdef HAVE_MC @@ -23,7 +28,7 @@ #include "simix/popping_private.h" #include "simix/smx_private.h" -#include "mc_forward.h" +#include "mc_forward.hpp" #include "mc_base.h" #include "mc_mmalloc.h" // std_heap #include "mc_memory_map.h" @@ -47,6 +52,11 @@ typedef struct s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_in namespace simgrid { namespace mc { +struct IgnoredRegion { + std::uint64_t addr; + size_t size; +}; + /** Representation of a process */ class Process : public AddressSpace { @@ -54,6 +64,7 @@ public: Process(pid_t pid, int sockfd); ~Process(); + bool is_self() const { return this->process_flags & MC_PROCESS_SELF_FLAG; @@ -64,6 +75,14 @@ public: remote_ptr address, int process_index = ProcessIndexAny, ReadMode mode = Normal) const override; void read_variable(const char* name, void* target, size_t size) const; + template + T 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)); + return res; + } char* read_string(remote_ptr address) const; // Write memory: @@ -71,11 +90,11 @@ public: void clear_bytes(remote_ptr address, size_t len); // Debug information: - mc_object_info_t find_object_info(remote_ptr addr) const; - mc_object_info_t find_object_info_exec(remote_ptr addr) const; - mc_object_info_t find_object_info_rw(remote_ptr addr) const; - dw_frame_t find_function(remote_ptr ip) const; - dw_variable_t find_variable(const char* name) const; + std::shared_ptr find_object_info(remote_ptr addr) const; + std::shared_ptr find_object_info_exec(remote_ptr addr) const; + std::shared_ptr find_object_info_rw(remote_ptr addr) const; + simgrid::mc::Frame* find_function(remote_ptr ip) const; + simgrid::mc::Variable* find_variable(const char* name) const; // Heap access: xbt_mheap_t get_heap() @@ -91,24 +110,76 @@ public: return this->heap_info; } + std::vector const& ignored_regions() const + { + return ignored_regions_; + } + void ignore_region(std::uint64_t address, std::size_t size); + + pid_t pid() const { return pid_; } + + bool in_maestro_stack(remote_ptr p) const + { + return p >= this->maestro_stack_start_ && p < this->maestro_stack_end_; + } + + bool running() const + { + return running_; + } + + void terminate(int status) + { + status_ = status; + running_ = false; + } + + int status() const + { + return status_; + } + + template + typename std::enable_if< std::is_class::value && std::is_trivial::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 + typename std::enable_if< std::is_class::value && std::is_trivial::value, ssize_t >::type + receive_message(M& m) + { + return MC_receive_message(this->socket_, &m, sizeof(M), 0); + } + private: void init_memory_map_info(); void refresh_heap(); void refresh_malloc_info(); -public: // to be private +private: mc_process_flags_t process_flags; - pid_t pid; - int socket; - int status; - bool running; - memory_map_t memory_map; - void *maestro_stack_start, *maestro_stack_end; - mc_object_info_t libsimgrid_info; - mc_object_info_t binary_info; - mc_object_info_t* object_infos; - size_t object_infos_size; + pid_t pid_; + int socket_; + int status_; + bool running_; + std::vector memory_map_; + remote_ptr maestro_stack_start_, maestro_stack_end_; int memory_file; + std::vector ignored_regions_; +public: // object info + // TODO, make private (first, objectify simgrid::mc::ObjectInformation*) + std::vector> object_infos; + std::shared_ptr libsimgrid_info; + std::shared_ptr binary_info; + +public: // Copies of MCed SMX data structures /** Copy of `simix_global->process_list` * * See mc_smx.c. @@ -143,12 +214,13 @@ public: // to be private */ malloc_info* heap_info; - // ***** Libunwind-data +public: // Libunwind-data /** Full-featured MC-aware libunwind address space for the process * * This address space is using a mc_unw_context_t - * (with mc_process_t/mc_address_space_t and unw_context_t). + * (with simgrid::mc::Process* / simgrid::mc::AddressSpace* + * and unw_context_t). */ unw_addr_space_t unw_addr_space; @@ -163,20 +235,18 @@ public: // to be private /** The corresponding context */ void* unw_underlying_context; - - xbt_dynar_t checkpoint_ignore; }; /** Open a FD to a remote process memory (`/dev/$pid/mem`) */ -int open_vm(pid_t pid, int flags); +XBT_PRIVATE int open_vm(pid_t pid, int flags); } } SG_BEGIN_DECL() -XBT_INTERNAL void MC_invalidate_cache(void); +XBT_PRIVATE void MC_invalidate_cache(void); SG_END_DECL()