#include <libunwind.h>
#include <libunwind-ptrace.h>
-#include <xbt/dynar.h>
#include <xbt/log.h>
#include <xbt/base.h>
#include <xbt/mmalloc.h>
using simgrid::mc::remote;
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc,
"MC process information");
-}
-
// ***** Helper stuff
namespace simgrid {
// ***** Process
Process::Process(pid_t pid, int sockfd) :
- AddressSpace(this),pid_(pid), socket_(sockfd), running_(true)
+ AddressSpace(this), pid_(pid), channel_(sockfd), running_(true)
{}
void Process::init()
this->smx_process_infos.clear();
this->smx_old_process_infos.clear();
- this->unw_addr_space = unw_create_addr_space(&mc_unw_accessors , __BYTE_ORDER);
- this->unw_underlying_addr_space = unw_create_addr_space(&mc_unw_vmread_accessors, __BYTE_ORDER);
- this->unw_underlying_context = _UPT_create(this->pid_);
+ this->unw_addr_space = simgrid::mc::UnwindContext::createUnwindAddressSpace();
+ this->unw_underlying_addr_space = simgrid::unw::create_addr_space();
+ this->unw_underlying_context = simgrid::unw::create_context(
+ this->unw_underlying_addr_space, this->pid_);
}
Process::~Process()
{
- if (this->socket_ >= 0 && close(this->socket_) < 0)
- xbt_die("Could not close communication socket");
-
- this->maestro_stack_start_ = nullptr;
- this->maestro_stack_end_ = nullptr;
-
if (this->memory_file >= 0)
close(this->memory_file);
unw_destroy_addr_space(this->unw_underlying_addr_space);
_UPT_destroy(this->unw_underlying_context);
}
- this->unw_underlying_context = nullptr;
- this->unw_underlying_addr_space = nullptr;
unw_destroy_addr_space(this->unw_addr_space);
- this->unw_addr_space = nullptr;
-
- this->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
if (this->clear_refs_fd_ >= 0)
close(this->clear_refs_fd_);
*/
void Process::refresh_heap()
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
// Read/dereference/refresh the std_heap pointer:
if (!this->heap)
this->heap = std::unique_ptr<s_xbt_mheap_t>(new s_xbt_mheap_t());
this->read_bytes(this->heap.get(), sizeof(struct mdesc),
remote(this->heap_address), simgrid::mc::ProcessIndexDisabled);
- this->cache_flags |= MC_PROCESS_CACHE_FLAG_HEAP;
+ this->cache_flags_ |= Process::cache_heap;
}
/** Refresh the information about the process
* */
void Process::refresh_malloc_info()
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
- if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
- this->refresh_heap();
// Refresh process->heapinfo:
+ if (this->cache_flags_ & Process::cache_malloc)
+ return;
size_t count = this->heap->heaplimit + 1;
if (this->heap_info.size() < count)
this->heap_info.resize(count);
this->read_bytes(this->heap_info.data(), count * sizeof(malloc_info),
remote(this->heap->heapinfo), simgrid::mc::ProcessIndexDisabled);
- this->cache_flags |= MC_PROCESS_CACHE_FLAG_MALLOC_INFO;
+ this->cache_flags_ |= Process::cache_malloc;
}
/** @brief Finds the range of the different memory segments and binary paths */
std::vector<simgrid::mc::SimixProcessInformation>& Process::simix_processes()
{
- xbt_assert(mc_mode != MC_MODE_CLIENT);
- MC_process_smx_refresh(&mc_model_checker->process());
+ this->refresh_simix();
return smx_process_infos;
}
+std::vector<simgrid::mc::SimixProcessInformation>& Process::old_simix_processes()
+{
+ this->refresh_simix();
+ return smx_old_process_infos;
+}
+
}
}