-/* Copyright (c) 2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2015-2017. 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. */
-#include <assert.h>
+#include "simgrid/s4u/Host.hpp"
-#include <xbt/log.h>
-#include <xbt/string.hpp>
-
-#include "src/simix/smx_private.h"
-
-#include "src/mc/mc_smx.h"
-#include "ModelChecker.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_smx.hpp"
using simgrid::mc::remote;
-extern "C" {
-
-static
-void MC_smx_process_info_clear(mc_smx_process_info_t p)
-{
- p->hostname = NULL;
- free(p->name);
- p->name = NULL;
-}
-
-xbt_dynar_t MC_smx_process_info_list_new(void)
-{
- return xbt_dynar_new(
- sizeof(s_mc_smx_process_info_t),
- ( void_f_pvoid_t) &MC_smx_process_info_clear);
-}
-
-static inline
-bool is_in_dynar(smx_process_t p, xbt_dynar_t dynar)
+/** HACK, Statically "upcast" a s_smx_actor_t into a ActorInformation
+ *
+ * This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
+ * sense that we could achieve the same thing by having ActorInformation
+ * inherit from s_smx_actor_t but we don't really want to do that.
+ */
+static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
{
- return (uintptr_t) p >= (uintptr_t) dynar->data
- && (uintptr_t) p < ((uintptr_t) dynar->data + dynar->used * dynar->elmsize);
-}
+ simgrid::mc::ActorInformation temp;
+ std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;
-static inline
-mc_smx_process_info_t MC_smx_process_get_info(smx_process_t p)
-{
- assert(is_in_dynar(p, mc_model_checker->process().smx_process_infos)
- || is_in_dynar(p, mc_model_checker->process().smx_old_process_infos));
- mc_smx_process_info_t process_info =
- (mc_smx_process_info_t)
- ((char*) p - offsetof(s_mc_smx_process_info_t, copy));
+ simgrid::mc::ActorInformation* process_info = (simgrid::mc::ActorInformation*)((char*)actor - offset);
return process_info;
}
-/** Load the remote swag of processes into a dynar
+/** Load the remote list of processes into a vector
*
- * @param process MCed process
- * @param target Local dynar (to be filled with copies of `s_smx_process_t`)
- * @param remote_swag Address of the process SWAG in the remote list
+ * @param process MCed process
+ * @param target Local vector (to be filled with copies of `s_smx_actor_t`)
+ * @param remote_dynar Address of the process dynar in the remote list
*/
-static void MC_process_refresh_simix_process_list(
- simgrid::mc::Process* process,
- xbt_dynar_t target, xbt_swag_t remote_swag)
+static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* process,
+ std::vector<simgrid::mc::ActorInformation>& target,
+ simgrid::mc::RemotePtr<s_xbt_dynar_t> remote_dynar)
{
- // swag = REMOTE(*simix_global->process_list)
- s_xbt_swag_t swag;
- process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
-
- smx_process_t p;
- xbt_dynar_reset(target);
-
- // Load each element of the dynar from the MCed process:
- int i = 0;
- for (p = (smx_process_t) swag.head; p; ++i) {
-
- s_mc_smx_process_info_t info;
- info.address = p;
- info.name = NULL;
- info.hostname = NULL;
- process->read_bytes(&info.copy, sizeof(info.copy), remote(p));
- xbt_dynar_push(target, &info);
-
- // Lookup next process address:
- p = (smx_process_t) xbt_swag_getNext(&info.copy, swag.offset);
+ target.clear();
+
+ s_xbt_dynar_t dynar;
+ process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
+
+ smx_actor_t* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
+ process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr<void>(dynar.data));
+
+ // Load each element of the vector from the MCed process:
+ for (unsigned int i = 0; i < dynar.used; ++i) {
+
+ simgrid::mc::ActorInformation info;
+ info.address = simgrid::mc::RemotePtr<simgrid::simix::ActorImpl>(data[i]);
+ info.hostname = nullptr;
+ process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
+ target.push_back(std::move(info));
}
- assert(i == swag.count);
+ ::operator delete(data);
}
+namespace simgrid {
+namespace mc {
-void MC_process_smx_refresh(simgrid::mc::Process* process)
+void RemoteClient::refresh_simix()
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
- if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
+ if (this->cache_flags_ & RemoteClient::cache_simix_processes)
return;
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
- // simix_global_p = REMOTE(simix_global);
- smx_global_t simix_global_p;
- process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
+ static_assert(std::is_same<
+ std::unique_ptr<simgrid::simix::Global>,
+ decltype(simix_global)
+ >::value, "Unexpected type for simix_global");
+ static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*),
+ "Bad size for simix_global");
+
+ RemotePtr<simgrid::simix::Global> simix_global_p{this->read_variable<simgrid::simix::Global*>("simix_global")};
// simix_global = REMOTE(*simix_global)
- s_smx_global_t simix_global;
- process->read_bytes(&simix_global, sizeof(simix_global),
- remote(simix_global_p));
+ Remote<simgrid::simix::Global> simix_global =
+ this->read<simgrid::simix::Global>(simix_global_p);
- MC_process_refresh_simix_process_list(
- process, process->smx_process_infos, simix_global.process_list);
- MC_process_refresh_simix_process_list(
- process, process->smx_old_process_infos, simix_global.process_to_destroy);
+ MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.getBuffer()->actors_vector));
+ MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos,
+ remote(simix_global.getBuffer()->dead_actors_vector));
+
+ this->cache_flags_ |= RemoteClient::cache_simix_processes;
+}
- process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+}
}
/** Get the issuer of a simcall (`req->issuer`)
*
* In split-process mode, it does the black magic necessary to get an address
- * of a (shallow) copy of the data structure the issuer SIMIX process in the local
+ * of a (shallow) copy of the data structure the issuer SIMIX actor in the local
* address space.
*
* @param process the MCed process
* @param req the simcall (copied in the local process)
*/
-smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
+smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
{
- if (mc_mode == MC_MODE_CLIENT)
- return req->issuer;
-
- MC_process_smx_refresh(&mc_model_checker->process());
+ xbt_assert(mc_model_checker != nullptr);
- // This is the address of the smx_process in the MCed process:
- void* address = req->issuer;
-
- unsigned i;
- mc_smx_process_info_t p;
+ // This is the address of the smx_actor in the MCed process:
+ auto address = simgrid::mc::remote(req->issuer);
// Lookup by address:
- xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, p)
- if (p->address == address)
- return &p->copy;
- xbt_dynar_foreach_ptr(mc_model_checker->process().smx_old_process_infos, i, p)
- if (p->address == address)
- return &p->copy;
+ for (auto& actor : mc_model_checker->process().actors())
+ if (actor.address == address)
+ return actor.copy.getBuffer();
+ for (auto& actor : mc_model_checker->process().dead_actors())
+ if (actor.address == address)
+ return actor.copy.getBuffer();
xbt_die("Issuer not found");
}
-smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
-{
- if (!process_remote_address)
- return NULL;
- if (mc_mode == MC_MODE_CLIENT)
- return process_remote_address;
-
- mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address);
- if (process_info)
- return &process_info->copy;
- else
- return NULL;
-}
-
-mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address)
-{
- if (mc_mode == MC_MODE_CLIENT)
- xbt_die("No process_info for local process is not enabled.");
-
- unsigned index;
- mc_smx_process_info_t process_info;
- xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, index, process_info)
- if (process_info->address == process_remote_address)
- return process_info;
- xbt_dynar_foreach_ptr(mc_model_checker->process().smx_old_process_infos, index, process_info)
- if (process_info->address == process_remote_address)
- return process_info;
- xbt_die("Process info not found");
-}
-
-const char* MC_smx_process_get_host_name(smx_process_t p)
+const char* MC_smx_actor_get_host_name(smx_actor_t actor)
{
- if (mc_mode == MC_MODE_CLIENT)
- return SIMIX_host_get_name(p->host);
+ if (mc_model_checker == nullptr)
+ return actor->host->getCname();
- simgrid::mc::Process* process = &mc_model_checker->process();
+ simgrid::mc::RemoteClient* process = &mc_model_checker->process();
- /* Horrible hack to find the offset of the id in the simgrid::Host.
+ /* HACK, 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
+ work in practice 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::Host.
+ any construction/destruction of the simgrid::s4u::Host.
*/
union fake_host {
- simgrid::Host host;
- fake_host() {}
- ~fake_host() {}
+ simgrid::s4u::Host host;
+ fake_host() { /* Nothing to do*/}
+ ~fake_host() { /* Nothing to do*/}
};
fake_host foo;
- const size_t offset = (char*) &foo.host.id() - (char*) &foo.host;
+ const size_t offset = (char*)&foo.host.getName() - (char*)&foo.host;
// Read the simgrid::xbt::string in the MCed process:
- mc_smx_process_info_t info = MC_smx_process_get_info(p);
- 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);
+ simgrid::mc::ActorInformation* info = actor_info_cast(actor);
+ auto remote_string_address = remote((simgrid::xbt::string_data*)((char*)actor->host + offset));
+ simgrid::xbt::string_data remote_string = process->read(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);
+ info->hostname = mc_model_checker->get_host_name(hostname).c_str();
return info->hostname;
}
-const char* MC_smx_process_get_name(smx_process_t p)
+const char* MC_smx_actor_get_name(smx_actor_t actor)
{
- simgrid::mc::Process* process = &mc_model_checker->process();
- if (mc_mode == MC_MODE_CLIENT)
- return p->name;
- if (!p->name)
- return NULL;
-
- mc_smx_process_info_t info = MC_smx_process_get_info(p);
- if (!info->name) {
- info->name = process->read_string(p->name);
+ simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ if (mc_model_checker == nullptr)
+ return actor->name.c_str();
+
+ simgrid::mc::ActorInformation* info = actor_info_cast(actor);
+ if (info->name.empty()) {
+ simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name);
+ info->name = process->read_string(remote(string_data.data), string_data.len);
}
- return info->name;
+ return info->name.c_str();
}
-#ifdef HAVE_SMPI
-int MC_smpi_process_count(void)
+#if HAVE_SMPI
+int MC_smpi_process_count()
{
- if (mc_mode == MC_MODE_CLIENT)
+ if (mc_model_checker == nullptr)
return smpi_process_count();
- else {
- int res;
- mc_model_checker->process().read_variable("process_count",
- &res, sizeof(res));
- return res;
- }
+ int res;
+ mc_model_checker->process().read_variable("process_count",
+ &res, sizeof(res));
+ return res;
}
#endif
-unsigned long MC_smx_get_maxpid(void)
+unsigned long MC_smx_get_maxpid()
{
unsigned long maxpid;
mc_model_checker->process().read_variable("simix_process_maxpid",
&maxpid, sizeof(maxpid));
return maxpid;
}
-
-}
