// ***** Helper stuff
#define SO_RE "\\.so[\\.0-9]*$"
-#define VERSION_RE "-[\\.0-9]*$"
+#define VERSION_RE "-[\\.0-9-]*$"
static const char *const FILTERED_LIBS[] = {
- "libstdc++",
+ "ld",
+ "libbz2",
+ "libboost_context",
+ "libc",
"libc++",
- "libm",
+ "libcdt",
+ "libcgraph",
+ "libdl",
+ "libdw",
+ "libelf",
"libgcc_s",
+ "liblua5.1",
+ "liblzma",
+ "libm",
"libpthread",
+ "librt",
+ "libstdc++",
"libunwind",
"libunwind-x86_64",
"libunwind-x86",
"libunwind-ptrace",
- "libdw",
- "libdl",
- "librt",
- "liblzma",
- "libelf",
- "libbz2",
- "libz",
- "libelf",
- "libc",
- "ld"
+ "libz"
};
static bool MC_is_simgrid_lib(const char* libname)
Process* process = this;
process->process_flags = MC_PROCESS_NO_FLAG;
- process->socket = sockfd;
+ process->socket_ = sockfd;
process->pid_ = pid;
if (pid==getpid())
process->process_flags |= MC_PROCESS_SELF_FLAG;
- process->running = true;
- process->status = 0;
- process->memory_map = MC_get_memory_map(pid);
+ process->running_ = true;
+ process->status_ = 0;
+ process->memory_map_ = get_memory_map(pid);
process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
process->heap = NULL;
process->heap_info = NULL;
{
Process* process = this;
+ if (this->socket_ >= 0 && close(this->socket_) < 0)
+ xbt_die("Could not close communication socket");
+
process->process_flags = MC_PROCESS_NO_FLAG;
process->pid_ = 0;
- MC_free_memory_map(process->memory_map);
- process->memory_map = NULL;
-
- process->maestro_stack_start = NULL;
- process->maestro_stack_end = NULL;
+ process->maestro_stack_start_ = nullptr;
+ process->maestro_stack_end_ = nullptr;
xbt_dynar_free(&process->smx_process_infos);
xbt_dynar_free(&process->smx_old_process_infos);
- size_t i;
- for (i=0; i!=process->object_infos_size; ++i) {
- MC_free_object_info(&process->object_infos[i]);
- }
- free(process->object_infos);
- process->object_infos = NULL;
- process->object_infos_size = 0;
if (process->memory_file >= 0) {
close(process->memory_file);
}
void Process::init_memory_map_info()
{
XBT_DEBUG("Get debug information ...");
- this->maestro_stack_start = NULL;
- this->maestro_stack_end = NULL;
- this->object_infos = NULL;
- this->object_infos_size = 0;
+ this->maestro_stack_start_ = nullptr;
+ this->maestro_stack_end_ = nullptr;
+ this->object_infos.resize(0);
this->binary_info = NULL;
this->libsimgrid_info = NULL;
if(regcomp(&res.so_re, SO_RE, 0) || regcomp(&res.version_re, VERSION_RE, 0))
xbt_die(".so regexp did not compile");
- memory_map_t maps = this->memory_map;
+ std::vector<simgrid::mc::VmMap> const& maps = this->memory_map_;
const char* current_name = NULL;
- for (ssize_t i=0; i < maps->mapsize; i++) {
- map_region_t reg = &(maps->regions[i]);
- const char* pathname = maps->regions[i].pathname;
+ this->object_infos.resize(0);
+
+ for (size_t i=0; i < maps.size(); i++) {
+ simgrid::mc::VmMap const& reg = maps[i];
+ const char* pathname = maps[i].pathname.c_str();
// Nothing to do
- if (maps->regions[i].pathname == NULL) {
+ if (maps[i].pathname.empty()) {
current_name = NULL;
continue;
}
// [stack], [vvar], [vsyscall], [vdso] ...
if (pathname[0] == '[') {
- if ((reg->prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) {
- this->maestro_stack_start = reg->start_addr;
- this->maestro_stack_end = reg->end_addr;
+ if ((reg.prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) {
+ this->maestro_stack_start_ = remote(reg.start_addr);
+ this->maestro_stack_end_ = remote(reg.end_addr);
}
current_name = NULL;
continue;
continue;
current_name = pathname;
- if (!(reg->prot & PROT_READ) && (reg->prot & PROT_EXEC))
+ if (!(reg.prot & PROT_READ) && (reg.prot & PROT_EXEC))
continue;
const bool is_executable = !i;
}
}
- mc_object_info_t info =
- MC_find_object_info(this->memory_map, pathname, is_executable);
- this->object_infos = (mc_object_info_t*) realloc(this->object_infos,
- (this->object_infos_size+1) * sizeof(mc_object_info_t*));
- this->object_infos[this->object_infos_size] = info;
- this->object_infos_size++;
+ std::shared_ptr<s_mc_object_info_t> info =
+ MC_find_object_info(this->memory_map_, pathname, is_executable);
+ this->object_infos.push_back(info);
if (is_executable)
this->binary_info = info;
else if (libname && MC_is_simgrid_lib(libname))
regfree(&res.version_re);
// Resolve time (including accross differents objects):
- for (size_t i=0; i!=this->object_infos_size; ++i)
- MC_post_process_object_info(this, this->object_infos[i]);
+ for (auto const& object_info : this->object_infos)
+ MC_post_process_object_info(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");
+ xbt_assert(this->maestro_stack_start_, "Did not find maestro_stack_start");
+ xbt_assert(this->maestro_stack_end_, "Did not find maestro_stack_end");
XBT_DEBUG("Get debug information done !");
}
-mc_object_info_t Process::find_object_info(remote_ptr<void> addr) const
+std::shared_ptr<s_mc_object_info_t> Process::find_object_info(remote_ptr<void> addr) const
{
- size_t i;
- for (i = 0; i != this->object_infos_size; ++i) {
- if (addr.address() >= (std::uint64_t)this->object_infos[i]->start
- && addr.address() <= (std::uint64_t)this->object_infos[i]->end) {
- return this->object_infos[i];
+ for (auto const& object_info : this->object_infos) {
+ if (addr.address() >= (std::uint64_t)object_info->start
+ && addr.address() <= (std::uint64_t)object_info->end) {
+ return object_info;
}
}
return NULL;
}
-mc_object_info_t Process::find_object_info_exec(remote_ptr<void> addr) const
+std::shared_ptr<s_mc_object_info_t> Process::find_object_info_exec(remote_ptr<void> addr) const
{
- size_t i;
- for (i = 0; i != this->object_infos_size; ++i) {
- if (addr.address() >= (std::uint64_t)this->object_infos[i]->start_exec
- && addr.address() <= (std::uint64_t)this->object_infos[i]->end_exec) {
- return this->object_infos[i];
+ for (std::shared_ptr<s_mc_object_info> const& info : this->object_infos) {
+ if (addr.address() >= (std::uint64_t) info->start_exec
+ && addr.address() <= (std::uint64_t) info->end_exec) {
+ return info;
}
}
- return NULL;
+ return nullptr;
}
-mc_object_info_t Process::find_object_info_rw(remote_ptr<void> addr) const
+std::shared_ptr<s_mc_object_info_t> Process::find_object_info_rw(remote_ptr<void> addr) const
{
- size_t i;
- for (i = 0; i != this->object_infos_size; ++i) {
- if (addr.address() >= (std::uint64_t)this->object_infos[i]->start_rw
- && addr.address() <= (std::uint64_t)this->object_infos[i]->end_rw) {
- return this->object_infos[i];
+ for (std::shared_ptr<s_mc_object_info> const& info : this->object_infos) {
+ if (addr.address() >= (std::uint64_t)info->start_rw
+ && addr.address() <= (std::uint64_t)info->end_rw) {
+ return info;
}
}
- return NULL;
+ return nullptr;
}
dw_frame_t Process::find_function(remote_ptr<void> ip) const
{
- mc_object_info_t info = this->find_object_info_exec(ip);
- if (info == NULL)
- return NULL;
+ std::shared_ptr<s_mc_object_info_t> info = this->find_object_info_exec(ip);
+ if (!info)
+ return nullptr;
else
- return MC_file_object_info_find_function(info, (void*) ip.address());
+ return MC_file_object_info_find_function(info.get(), (void*) ip.address());
}
/** Find (one occurence of) the named variable definition
*/
dw_variable_t Process::find_variable(const char* name) const
{
- const size_t n = this->object_infos_size;
- size_t i;
-
// First lookup the variable in the executable shared object.
// A global variable used directly by the executable code from a library
// is reinstanciated in the executable memory .data/.bss.
// We need to look up the variable in the execvutable first.
if (this->binary_info) {
- mc_object_info_t info = this->binary_info;
- dw_variable_t var = MC_file_object_info_find_variable_by_name(info, name);
+ std::shared_ptr<s_mc_object_info_t> const& info = this->binary_info;
+ dw_variable_t var = MC_file_object_info_find_variable_by_name(info.get(), name);
if (var)
return var;
}
- for (i=0; i!=n; ++i) {
- mc_object_info_t info = this->object_infos[i];
- dw_variable_t var = MC_file_object_info_find_variable_by_name(info, name);
+ for (std::shared_ptr<s_mc_object_info_t> const& info : this->object_infos) {
+ dw_variable_t var = MC_file_object_info_find_variable_by_name(info.get(), name);
if (var)
return var;
}
if (!address)
return NULL;
if (this->is_self())
- return strdup((char*) address.address());
+ return xbt_strdup((char*) address.address());
off_t len = 128;
char* res = (char*) malloc(len);
AddressSpace::ReadMode mode) const
{
if (process_index != simgrid::mc::ProcessIndexDisabled) {
- mc_object_info_t info = this->find_object_info_rw((void*)address.address());
+ std::shared_ptr<s_mc_object_info_t> const& info =
+ this->find_object_info_rw((void*)address.address());
// Segment overlap is not handled.
- if (MC_object_info_is_privatized(info)) {
+ if (MC_object_info_is_privatized(info.get())) {
if (process_index < 0)
xbt_die("Missing process index");
+ if (process_index >= (int) MC_smpi_process_count())
+ xbt_die("Invalid process index");
+
+ // Read smpi_privatisation_regions from MCed:
+ smpi_privatisation_region_t remote_smpi_privatisation_regions =
+ mc_model_checker->process().read_variable<smpi_privatisation_region_t>(
+ "smpi_privatisation_regions");
+
+ s_smpi_privatisation_region_t privatisation_region =
+ mc_model_checker->process().read<s_smpi_privatisation_region_t>(
+ remote(remote_smpi_privatisation_regions + process_index));
+
// Address translation in the privaization segment:
- // TODO, fix me (broken)
size_t offset = address.address() - (std::uint64_t)info->start_rw;
- address = remote(address.address() - offset);
+ address = remote((char*)privatisation_region.address + offset);
}
}
