/* 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. */
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
#include <xbt/log.h>
+#include <xbt/dynar.h>
+#include <xbt/str.h>
+#include <xbt/swag.h>
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
-#include "mc_smx.h"
-#include "ModelChecker.hpp"
+#include "src/mc/mc_smx.h"
+#include "src/mc/ModelChecker.hpp"
using simgrid::mc::remote;
static
void MC_smx_process_info_clear(mc_smx_process_info_t p)
{
- p->hostname = NULL;
- free(p->name);
- p->name = NULL;
+ p->hostname = nullptr;
+ std::free(p->name);
+ p->name = nullptr;
}
xbt_dynar_t MC_smx_process_info_list_new(void)
s_mc_smx_process_info_t info;
info.address = p;
- info.name = NULL;
- info.hostname = NULL;
+ info.name = nullptr;
+ info.hostname = nullptr;
process->read_bytes(&info.copy, sizeof(info.copy), remote(p));
xbt_dynar_push(target, &info);
void MC_process_smx_refresh(simgrid::mc::Process* process)
{
xbt_assert(mc_mode == MC_MODE_SERVER);
- xbt_assert(!process->is_self());
if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
return;
smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
{
if (!process_remote_address)
- return NULL;
+ return nullptr;
if (mc_mode == MC_MODE_CLIENT)
return process_remote_address;
if (process_info)
return &process_info->copy;
else
- return NULL;
+ return nullptr;
}
mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address)
const char* MC_smx_process_get_host_name(smx_process_t p)
{
if (mc_mode == MC_MODE_CLIENT)
- return SIMIX_host_get_name(p->host);
+ return sg_host_get_name(p->host);
simgrid::mc::Process* process = &mc_model_checker->process();
- // Currently, smx_host_t = xbt_dictelm_t.
- // TODO, add an static_assert on this if switching to C++
- // The host name is host->key and the host->key_len==strlen(host->key).
- s_xbt_dictelm_t host_copy;
+ /* Horrible hack to find the offset of the id in the simgrid::s4u::Host.
+
+ Offsetof is not supported for non-POD types but this should
+ work in pratice for the targets currently supported by the MC
+ as long as we do not add funny features to the Host class
+ (such as virtual base).
+
+ We are using a (C++11) unrestricted union in order to avoid
+ any construction/destruction of the simgrid::s4u::Host.
+ */
+ union fake_host {
+ simgrid::s4u::Host host;
+ fake_host() {}
+ ~fake_host() {}
+ };
+ fake_host foo;
+ const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
+
+ // Read the simgrid::xbt::string in the MCed process:
mc_smx_process_info_t info = MC_smx_process_get_info(p);
- if (!info->hostname) {
-
- // Read the hostname from the MCed process:
- process->read_bytes(&host_copy, sizeof(host_copy), remote(p->host));
- int len = host_copy.key_len + 1;
- char hostname[len];
- process->read_bytes(hostname, len, remote(host_copy.key));
- info->hostname = mc_model_checker->get_host_name(hostname);
- }
+ simgrid::xbt::string_data remote_string;
+ auto remote_string_address = remote(
+ (simgrid::xbt::string_data*) ((char*) p->host + offset));
+ process->read_bytes(&remote_string, sizeof(remote_string), remote_string_address);
+ char hostname[remote_string.len];
+ process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
+ info->hostname = mc_model_checker->get_host_name(hostname);
return info->hostname;
}
if (mc_mode == MC_MODE_CLIENT)
return p->name;
if (!p->name)
- return NULL;
+ return nullptr;
mc_smx_process_info_t info = MC_smx_process_get_info(p);
if (!info->name) {