#include <xbt/base.h>
#include <xbt/mmalloc.h>
-#include "src/mc/mc_object_info.h"
#include "src/mc/mc_unw.h"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_ignore.h"
using simgrid::mc::remote;
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc,
"MC process information");
// ***** Helper stuff
+namespace simgrid {
+namespace mc {
+
#define SO_RE "\\.so[\\.0-9]*$"
#define VERSION_RE "-[\\.0-9-]*$"
// In lexicographic order (but this is currently not used in the code):
-static const char *const FILTERED_LIBS[] = {
+static const char *const filtered_libraries[] = {
"ld",
"libbz2",
"libboost_chrono",
"libz"
};
-static bool MC_is_simgrid_lib(const char* libname)
+static bool is_simgrid_lib(const char* libname)
{
return !strcmp(libname, "libsimgrid");
}
-static bool MC_is_filtered_lib(const char* libname)
+static bool is_filtered_lib(const char* libname)
{
- for (const char* filtered_lib : FILTERED_LIBS)
+ for (const char* filtered_lib : filtered_libraries)
if (strcmp(libname, filtered_lib)==0)
return true;
return false;
regex_t version_re;
};
-static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res)
+static char* get_lib_name(const char* pathname, struct s_mc_memory_map_re* res)
{
- const char* map_basename = xbt_basename((char*) pathname);
+ char* map_basename = xbt_basename(pathname);
regmatch_t match;
- if(regexec(&res->so_re, map_basename, 1, &match, 0))
+ if(regexec(&res->so_re, map_basename, 1, &match, 0)) {
+ free(map_basename);
return nullptr;
+ }
char* libname = strndup(map_basename, match.rm_so);
+ free(map_basename);
+ map_basename = nullptr;
// Strip the version suffix:
if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) {
static const void* zero_buffer;
static const size_t zero_buffer_size = 10 * 4096;
-static void MC_zero_buffer_init(void)
+static void zero_buffer_init(void)
{
int fd = open("/dev/zero", O_RDONLY);
if (fd<0)
return open(buff, flags);
}
-}
-
-namespace simgrid {
-namespace mc {
-
int open_vm(pid_t pid, int flags)
{
const size_t buffer_size = 30;
return open(buffer, flags);
}
-
-}
-}
-
// ***** Process
-namespace simgrid {
-namespace mc {
-
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()
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_);
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 */
const char* current_name = nullptr;
- this->object_infos.resize(0);
+ this->object_infos.clear();
for (size_t i=0; i < maps.size(); i++) {
simgrid::xbt::VmMap const& reg = maps[i];
const bool is_executable = !i;
char* libname = nullptr;
if (!is_executable) {
- libname = MC_get_lib_name(pathname, &res);
+ libname = get_lib_name(pathname, &res);
if(!libname)
continue;
- if (MC_is_filtered_lib(libname)) {
+ if (is_filtered_lib(libname)) {
free(libname);
continue;
}
}
std::shared_ptr<simgrid::mc::ObjectInformation> info =
- MC_find_object_info(this->memory_map_, pathname);
+ simgrid::mc::createObjectInformation(this->memory_map_, pathname);
this->object_infos.push_back(info);
if (is_executable)
this->binary_info = info;
- else if (libname && MC_is_simgrid_lib(libname))
+ else if (libname && is_simgrid_lib(libname))
this->libsimgrid_info = info;
free(libname);
}
// Resolve time (including accross differents objects):
for (auto const& object_info : this->object_infos)
- MC_post_process_object_info(this, object_info.get());
+ postProcessObjectInformation(this, object_info.get());
xbt_assert(this->maestro_stack_start_, "Did not find maestro_stack_start");
xbt_assert(this->maestro_stack_end_, "Did not find maestro_stack_end");
std::shared_ptr<simgrid::mc::ObjectInformation> const& info =
this->find_object_info_rw((void*)address.address());
// Segment overlap is not handled.
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (info.get() && this->privatized(*info)) {
if (process_index < 0)
xbt_die("Missing process index");
void Process::clear_bytes(RemotePtr<void> address, size_t len)
{
- pthread_once(&zero_buffer_flag, MC_zero_buffer_init);
+ pthread_once(&zero_buffer_flag, zero_buffer_init);
while (len) {
size_t s = len > zero_buffer_size ? zero_buffer_size : len;
this->write_bytes(zero_buffer, s, address);
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()
+{
+ xbt_assert(mc_mode != MC_MODE_CLIENT);
+ this->refresh_simix();
+ return smx_old_process_infos;
+}
+
}
}
