#include "simix/smx_private.h"
#include "mc_smx.h"
-#include "mc_model_checker.h"
+#include "ModelChecker.hpp"
+
+using simgrid::mc::remote;
extern "C" {
void MC_smx_process_info_clear(mc_smx_process_info_t p)
{
p->hostname = NULL;
-
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
free(p->name);
- mmalloc_set_current_heap(heap);
-
p->name = NULL;
}
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));
+ 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));
{
// swag = REMOTE(*simix_global->process_list)
s_xbt_swag_t swag;
- MC_process_read(process, MC_PROCESS_NO_FLAG, &swag, remote_swag, sizeof(swag),
- MC_PROCESS_INDEX_ANY);
+ process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
smx_process_t p;
xbt_dynar_reset(target);
info.address = p;
info.name = NULL;
info.hostname = NULL;
- MC_process_read(process, MC_PROCESS_NO_FLAG,
- &info.copy, p, sizeof(info.copy), MC_PROCESS_INDEX_ANY);
+ process->read_bytes(&info.copy, sizeof(info.copy), remote(p));
xbt_dynar_push(target, &info);
// Lookup next process address:
void MC_process_smx_refresh(mc_process_t process)
{
+ xbt_assert(mc_mode == MC_MODE_SERVER);
+ xbt_assert(!process->is_self());
if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
return;
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
-
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
// simix_global_p = REMOTE(simix_global);
smx_global_t simix_global_p;
- MC_process_read_variable(process, "simix_global", &simix_global_p, sizeof(simix_global_p));
+ process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
// simix_global = REMOTE(*simix_global)
s_smx_global_t simix_global;
- MC_process_read(process, MC_PROCESS_NO_FLAG, &simix_global, simix_global_p, sizeof(simix_global),
- MC_PROCESS_INDEX_ANY);
+ process->read_bytes(&simix_global, sizeof(simix_global),
+ remote(simix_global_p));
MC_process_refresh_simix_process_list(
process, process->smx_process_infos, simix_global.process_list);
process, process->smx_old_process_infos, simix_global.process_to_destroy);
process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
- mmalloc_set_current_heap(heap);
}
/** Get the issuer of a simcall (`req->issuer`)
*/
smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
{
- if (MC_process_is_self(&mc_model_checker->process))
+ if (mc_mode == MC_MODE_CLIENT)
return req->issuer;
- MC_process_smx_refresh(&mc_model_checker->process);
+ MC_process_smx_refresh(&mc_model_checker->process());
// This is the address of the smx_process in the MCed process:
void* address = req->issuer;
mc_smx_process_info_t p;
// Lookup by address:
- xbt_dynar_foreach_ptr(mc_model_checker->process.smx_process_infos, i, p)
+ 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)
+ xbt_dynar_foreach_ptr(mc_model_checker->process().smx_old_process_infos, i, p)
if (p->address == address)
return &p->copy;
{
if (!process_remote_address)
return NULL;
- if (MC_process_is_self(&mc_model_checker->process))
+ 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);
mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address)
{
- if (MC_process_is_self(&mc_model_checker->process))
+ 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)
+ 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)
+ 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)
{
- if (MC_process_is_self(&mc_model_checker->process))
+ if (mc_mode == MC_MODE_CLIENT)
return SIMIX_host_get_name(p->smx_host);
- mc_process_t process = &mc_model_checker->process;
+ mc_process_t process = &mc_model_checker->process();
// Currently, smx_host_t = xbt_dictelm_t.
// TODO, add an static_assert on this if switching to C++
if (!info->hostname) {
// Read the hostname from the MCed process:
- MC_process_read_simple(process, &host_copy, p->smx_host, sizeof(host_copy));
+ process->read_bytes(&host_copy, sizeof(host_copy), remote(p->smx_host));
int len = host_copy.key_len + 1;
char hostname[len];
- MC_process_read_simple(process, hostname, host_copy.key, len);
-
- // Lookup the host name in the dictionary (or create it):
- xbt_dictelm_t elt = xbt_dict_get_elm_or_null(mc_model_checker->hosts, hostname);
- if (!elt) {
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
- xbt_dict_set(mc_model_checker->hosts, hostname, NULL, NULL);
- elt = xbt_dict_get_elm_or_null(mc_model_checker->hosts, hostname);
- assert(elt);
- mmalloc_set_current_heap(heap);
- }
-
- info->hostname = elt->key;
+ process->read_bytes(hostname, len, remote(host_copy.key));
+ info->hostname = mc_model_checker->get_host_name(hostname);
}
return info->hostname;
}
const char* MC_smx_process_get_name(smx_process_t p)
{
- mc_process_t process = &mc_model_checker->process;
- if (MC_process_is_self(process))
+ mc_process_t 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) {
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
- info->name = MC_process_read_string(process, p->name);
- mmalloc_set_current_heap(heap);
+ info->name = process->read_string(p->name);
}
return info->name;
}
int MC_smpi_process_count(void)
{
- if (MC_process_is_self(&mc_model_checker->process))
+ if (mc_mode == MC_MODE_CLIENT)
return smpi_process_count();
else {
int res;
- MC_process_read_variable(&mc_model_checker->process, "process_count",
+ mc_model_checker->process().read_variable("process_count",
&res, sizeof(res));
return res;
}
}
+unsigned long MC_smx_get_maxpid(void)
+{
+ unsigned long maxpid;
+ mc_model_checker->process().read_variable("simix_process_maxpid",
+ &maxpid, sizeof(maxpid));
+ return maxpid;
+}
+
}
