#include "mc_smx.h"
#include "mc_server.h"
+using simgrid::mc::remote;
+
extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc,
"MC process information");
-static void MC_process_init_memory_map_info(mc_process_t process);
-static void MC_process_open_memory_file(mc_process_t process);
+// ***** Helper stuff
+
+#define SO_RE "\\.so[\\.0-9]*$"
+#define VERSION_RE "-[\\.0-9]*$"
+
+static const char *const FILTERED_LIBS[] = {
+ "libstdc++",
+ "libc++",
+ "libm",
+ "libgcc_s",
+ "libpthread",
+ "libunwind",
+ "libunwind-x86_64",
+ "libunwind-x86",
+ "libunwind-ptrace",
+ "libdw",
+ "libdl",
+ "librt",
+ "liblzma",
+ "libelf",
+ "libbz2",
+ "libz",
+ "libelf",
+ "libc",
+ "ld"
+};
+
+static bool MC_is_simgrid_lib(const char* libname)
+{
+ return !strcmp(libname, "libsimgrid");
+}
+
+static bool MC_is_filtered_lib(const char* libname)
+{
+ for (const char* filtered_lib : FILTERED_LIBS)
+ if (strcmp(libname, filtered_lib)==0)
+ return true;
+ return false;
+}
+
+struct s_mc_memory_map_re {
+ regex_t so_re;
+ regex_t version_re;
+};
+
+static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res)
+{
+ const char* map_basename = basename((char*) pathname);
+
+ regmatch_t match;
+ if(regexec(&res->so_re, map_basename, 1, &match, 0))
+ return NULL;
+
+ char* libname = strndup(map_basename, match.rm_so);
+
+ // Strip the version suffix:
+ if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) {
+ char* temp = libname;
+ libname = strndup(temp, match.rm_so);
+ free(temp);
+ }
+
+ return libname;
+}
+
+static ssize_t pread_whole(int fd, void *buf, size_t count, off_t offset)
+{
+ char* buffer = (char*) buf;
+ ssize_t real_count = count;
+ while (count) {
+ ssize_t res = pread(fd, buffer, count, offset);
+ if (res > 0) {
+ count -= res;
+ buffer += res;
+ offset += res;
+ } else if (res==0) {
+ return -1;
+ } else if (errno != EINTR) {
+ return -1;
+ }
+ }
+ return real_count;
+}
+
+static ssize_t pwrite_whole(int fd, const void *buf, size_t count, off_t offset)
+{
+ const char* buffer = (const char*) buf;
+ ssize_t real_count = count;
+ while (count) {
+ ssize_t res = pwrite(fd, buffer, count, offset);
+ if (res > 0) {
+ count -= res;
+ buffer += res;
+ offset += res;
+ } else if (res==0) {
+ return -1;
+ } else if (errno != EINTR) {
+ return -1;
+ }
+ }
+ return real_count;
+}
-// ***** Destructor callbacks
+static pthread_once_t zero_buffer_flag = PTHREAD_ONCE_INIT;
+static const void* zero_buffer;
+static const size_t zero_buffer_size = 10 * 4096;
-// ***** mc_address_space methods for mc_process
+static void MC_zero_buffer_init(void)
+{
+ int fd = open("/dev/zero", O_RDONLY);
+ if (fd<0)
+ xbt_die("Could not open /dev/zero");
+ zero_buffer = mmap(NULL, zero_buffer_size, PROT_READ, MAP_SHARED, fd, 0);
+ if (zero_buffer == MAP_FAILED)
+ xbt_die("Could not map the zero buffer");
+ close(fd);
+}
+
+}
-static mc_process_t MC_process_get_process(mc_process_t p) {
- return p;
+namespace simgrid {
+namespace mc {
+
+int open_vm(pid_t pid, int flags)
+{
+ const size_t buffer_size = 30;
+ char buffer[buffer_size];
+ int res = snprintf(buffer, buffer_size, "/proc/%lli/mem", (long long) pid);
+ if (res < 0 || (size_t) res >= buffer_size) {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ return open(buffer, flags);
}
+
+}
}
-// ***** mc_process
+// ***** Process
namespace simgrid {
namespace mc {
process->running = true;
process->status = 0;
process->memory_map = MC_get_memory_map(pid);
- process->memory_file = -1;
process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
process->heap = NULL;
process->heap_info = NULL;
- MC_process_init_memory_map_info(process);
- MC_process_open_memory_file(process);
+ process->init_memory_map_info();
+
+ // Open the memory file
+ if (process->is_self())
+ process->memory_file = -1;
+ else {
+ int fd = open_vm(process->pid, O_RDWR);
+ if (fd<0)
+ xbt_die("Could not open file for process virtual address space");
+ process->memory_file = fd;
+ }
// Read std_heap (is a struct mdesc*):
- dw_variable_t std_heap_var = MC_process_find_variable_by_name(process,
- "__mmalloc_default_mdp");
+ dw_variable_t std_heap_var = process->find_variable("__mmalloc_default_mdp");
if (!std_heap_var)
xbt_die("No heap information in the target process");
if(!std_heap_var->address)
xbt_die("No constant address for this variable");
- MC_process_read(process, simgrid::mc::AddressSpace::Normal,
- &process->heap_address, std_heap_var->address, sizeof(struct mdesc*),
+ process->read_bytes(&process->heap_address, sizeof(struct mdesc*),
+ remote(std_heap_var->address),
simgrid::mc::ProcessIndexDisabled);
process->smx_process_infos = MC_smx_process_info_list_new();
if (!this->heap) {
this->heap = (struct mdesc*) malloc(sizeof(struct mdesc));
}
- MC_process_read(this, simgrid::mc::AddressSpace::Normal,
- this->heap, this->heap_address, sizeof(struct mdesc),
- simgrid::mc::ProcessIndexDisabled
- );
+ this->read_bytes(this->heap, sizeof(struct mdesc), remote(this->heap_address),
+ simgrid::mc::ProcessIndexDisabled);
this->cache_flags |= MC_PROCESS_CACHE_FLAG_HEAP;
}
size_t malloc_info_bytesize =
(this->heap->heaplimit + 1) * sizeof(malloc_info);
this->heap_info = (malloc_info*) realloc(this->heap_info, malloc_info_bytesize);
- MC_process_read(this, simgrid::mc::AddressSpace::Normal,
- this->heap_info,
- this->heap->heapinfo, malloc_info_bytesize,
- simgrid::mc::ProcessIndexDisabled);
+ this->read_bytes(this->heap_info, malloc_info_bytesize,
+ remote(this->heap->heapinfo), simgrid::mc::ProcessIndexDisabled);
this->cache_flags |= MC_PROCESS_CACHE_FLAG_MALLOC_INFO;
}
-}
-}
-
-extern "C" {
-
-#define SO_RE "\\.so[\\.0-9]*$"
-#define VERSION_RE "-[\\.0-9]*$"
-
-const char* FILTERED_LIBS[] = {
- "libstdc++",
- "libc++",
- "libm",
- "libgcc_s",
- "libpthread",
- "libunwind",
- "libunwind-x86_64",
- "libunwind-x86",
- "libunwind-ptrace",
- "libdw",
- "libdl",
- "librt",
- "liblzma",
- "libelf",
- "libbz2",
- "libz",
- "libelf",
- "libc",
- "ld"
-};
-
-static bool MC_is_simgrid_lib(const char* libname)
-{
- return !strcmp(libname, "libsimgrid");
-}
-
-static bool MC_is_filtered_lib(const char* libname)
-{
- const size_t n = sizeof(FILTERED_LIBS) / sizeof(const char*);
- size_t i;
- for (i=0; i!=n; ++i)
- if (strcmp(libname, FILTERED_LIBS[i])==0)
- return true;
- return false;
-}
-
-struct s_mc_memory_map_re {
- regex_t so_re;
- regex_t version_re;
-};
-
-static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) {
- const char* map_basename = basename((char*) pathname);
-
- regmatch_t match;
- if(regexec(&res->so_re, map_basename, 1, &match, 0))
- return NULL;
-
- char* libname = strndup(map_basename, match.rm_so);
-
- // Strip the version suffix:
- if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) {
- char* temp = libname;
- libname = strndup(temp, match.rm_so);
- free(temp);
- }
-
- return libname;
-}
-
/** @brief Finds the range of the different memory segments and binary paths */
-static void MC_process_init_memory_map_info(mc_process_t process)
+void Process::init_memory_map_info()
{
XBT_DEBUG("Get debug information ...");
- process->maestro_stack_start = NULL;
- process->maestro_stack_end = NULL;
- process->object_infos = NULL;
- process->object_infos_size = 0;
- process->binary_info = NULL;
- process->libsimgrid_info = NULL;
+ this->maestro_stack_start = NULL;
+ this->maestro_stack_end = NULL;
+ this->object_infos = NULL;
+ this->object_infos_size = 0;
+ this->binary_info = NULL;
+ this->libsimgrid_info = NULL;
struct s_mc_memory_map_re res;
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 = process->memory_map;
+ memory_map_t maps = this->memory_map;
const char* current_name = NULL;
// [stack], [vvar], [vsyscall], [vdso] ...
if (pathname[0] == '[') {
if ((reg->prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) {
- process->maestro_stack_start = reg->start_addr;
- process->maestro_stack_end = reg->end_addr;
+ this->maestro_stack_start = reg->start_addr;
+ this->maestro_stack_end = reg->end_addr;
}
current_name = NULL;
continue;
}
mc_object_info_t info =
- MC_find_object_info(process->memory_map, pathname, is_executable);
- process->object_infos = (mc_object_info_t*) realloc(process->object_infos,
- (process->object_infos_size+1) * sizeof(mc_object_info_t*));
- process->object_infos[process->object_infos_size] = info;
- process->object_infos_size++;
+ 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++;
if (is_executable)
- process->binary_info = info;
+ this->binary_info = info;
else if (libname && MC_is_simgrid_lib(libname))
- process->libsimgrid_info = info;
+ this->libsimgrid_info = info;
free(libname);
}
regfree(&res.so_re);
regfree(&res.version_re);
- // Resolve time (including accress differents objects):
- for (size_t i=0; i!=process->object_infos_size; ++i)
- MC_post_process_object_info(process, process->object_infos[i]);
+ // 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]);
- xbt_assert(process->maestro_stack_start, "Did not find maestro_stack_start");
- xbt_assert(process->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 MC_process_find_object_info(mc_process_t process, const void *addr)
+mc_object_info_t Process::find_object_info(remote_ptr<void> addr) const
{
size_t i;
- for (i = 0; i != process->object_infos_size; ++i) {
- if (addr >= (void *) process->object_infos[i]->start
- && addr <= (void *) process->object_infos[i]->end) {
- return process->object_infos[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];
}
}
return NULL;
}
-mc_object_info_t MC_process_find_object_info_exec(mc_process_t process, const void *addr)
+mc_object_info_t Process::find_object_info_exec(remote_ptr<void> addr) const
{
size_t i;
- for (i = 0; i != process->object_infos_size; ++i) {
- if (addr >= (void *) process->object_infos[i]->start_exec
- && addr <= (void *) process->object_infos[i]->end_exec) {
- return process->object_infos[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];
}
}
return NULL;
}
-mc_object_info_t MC_process_find_object_info_rw(mc_process_t process, const void *addr)
+mc_object_info_t Process::find_object_info_rw(remote_ptr<void> addr) const
{
size_t i;
- for (i = 0; i != process->object_infos_size; ++i) {
- if (addr >= (void *) process->object_infos[i]->start_rw
- && addr <= (void *) process->object_infos[i]->end_rw) {
- return process->object_infos[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];
}
}
return NULL;
}
-// Functions, variables…
-
-dw_frame_t MC_process_find_function(mc_process_t process, const void *ip)
+dw_frame_t Process::find_function(remote_ptr<void> ip) const
{
- mc_object_info_t info = MC_process_find_object_info_exec(process, ip);
+ mc_object_info_t info = this->find_object_info_exec(ip);
if (info == NULL)
return NULL;
else
- return MC_file_object_info_find_function(info, ip);
+ return MC_file_object_info_find_function(info, (void*) ip.address());
}
-dw_variable_t MC_process_find_variable_by_name(mc_process_t process, const char* name)
+/** Find (one occurence of) the named variable definition
+ */
+dw_variable_t Process::find_variable(const char* name) const
{
- const size_t n = process->object_infos_size;
+ 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 (process->binary_info) {
- mc_object_info_t info = process->binary_info;
+ 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);
if (var)
return var;
}
for (i=0; i!=n; ++i) {
- mc_object_info_t info =process->object_infos[i];
+ mc_object_info_t info = this->object_infos[i];
dw_variable_t var = MC_file_object_info_find_variable_by_name(info, name);
if (var)
return var;
return NULL;
}
-void MC_process_read_variable(mc_process_t process, const char* name, void* target, size_t size)
+void Process::read_variable(const char* name, void* target, size_t size) const
{
- dw_variable_t var = MC_process_find_variable_by_name(process, name);
+ dw_variable_t var = this->find_variable(name);
if (!var->address)
xbt_die("No simple location for this variable");
if (!var->type->full_type)
if ((size_t) var->type->full_type->byte_size != size)
xbt_die("Unexpected size for %s (expected %zi, was %zi)",
name, size, (size_t) var->type->full_type->byte_size);
- MC_process_read(process, simgrid::mc::AddressSpace::Normal, target, var->address, size,
- simgrid::mc::ProcessIndexAny);
+ this->read_bytes(target, size, remote(var->address));
}
-char* MC_process_read_string(mc_process_t process, void* address)
+char* Process::read_string(remote_ptr<void> address) const
{
if (!address)
return NULL;
- if (process->is_self())
- return strdup((char*) address);
+ if (this->is_self())
+ return strdup((char*) address.address());
off_t len = 128;
char* res = (char*) malloc(len);
off_t off = 0;
while (1) {
- ssize_t c = pread(process->memory_file, res + off, len - off, (off_t) address + off);
+ ssize_t c = pread(this->memory_file, res + off, len - off, (off_t) address.address() + off);
if (c == -1) {
if (errno == EINTR)
continue;
}
}
-// ***** Memory access
-
-int MC_process_vm_open(pid_t pid, int flags)
-{
- const size_t buffer_size = 30;
- char buffer[buffer_size];
- int res = snprintf(buffer, buffer_size, "/proc/%lli/mem", (long long) pid);
- if (res < 0 || (size_t) res >= buffer_size) {
- errno = ENAMETOOLONG;
- return -1;
- }
- return open(buffer, flags);
-}
-
-static void MC_process_open_memory_file(mc_process_t process)
-{
- if (process->is_self() || process->memory_file >= 0)
- return;
-
- int fd = MC_process_vm_open(process->pid, O_RDWR);
- if (fd<0)
- xbt_die("Could not open file for process virtual address space");
- process->memory_file = fd;
-}
-
-static ssize_t pread_whole(int fd, void *buf, size_t count, off_t offset)
-{
- char* buffer = (char*) buf;
- ssize_t real_count = count;
- while (count) {
- ssize_t res = pread(fd, buffer, count, offset);
- if (res > 0) {
- count -= res;
- buffer += res;
- offset += res;
- } else if (res==0) {
- return -1;
- } else if (errno != EINTR) {
- return -1;
- }
- }
- return real_count;
-}
-
-static ssize_t pwrite_whole(int fd, const void *buf, size_t count, off_t offset)
-{
- const char* buffer = (const char*) buf;
- ssize_t real_count = count;
- while (count) {
- ssize_t res = pwrite(fd, buffer, count, offset);
- if (res > 0) {
- count -= res;
- buffer += res;
- offset += res;
- } else if (res==0) {
- return -1;
- } else if (errno != EINTR) {
- return -1;
- }
- }
- return real_count;
-}
-
-}
-
-namespace simgrid {
-namespace mc {
-
const void *Process::read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index,
- AddressSpace::ReadMode mode)
+ AddressSpace::ReadMode mode) const
{
if (process_index != simgrid::mc::ProcessIndexDisabled) {
- mc_object_info_t info = MC_process_find_object_info_rw(this, (void*)address.address());
+ mc_object_info_t info = this->find_object_info_rw((void*)address.address());
// Segment overlap is not handled.
if (MC_object_info_is_privatized(info)) {
if (process_index < 0)
}
}
+/** Write data to a process memory
+ *
+ * @param process the process
+ * @param local local memory address (source)
+ * @param remote target process memory address (target)
+ * @param len data size
+ */
+void Process::write_bytes(const void* buffer, size_t len, remote_ptr<void> address)
+{
+ if (this->is_self()) {
+ memcpy((void*)address.address(), buffer, len);
+ } else {
+ if (pwrite_whole(this->memory_file, buffer, len, address.address()) < 0)
+ xbt_die("Write to process %lli failed", (long long) this->pid);
+ }
+}
+
+void Process::clear_bytes(remote_ptr<void> address, size_t len)
+{
+ if (this->is_self()) {
+ memset((void*)address.address(), 0, len);
+ } else {
+ pthread_once(&zero_buffer_flag, MC_zero_buffer_init);
+ while (len) {
+ size_t s = len > zero_buffer_size ? zero_buffer_size : len;
+ this->write_bytes(zero_buffer, s, address);
+ address = remote((char*) address.address() + s);
+ len -= s;
+ }
+ }
+}
+
}
}
void* local, const void* remote_dynar, size_t i, size_t len)
{
s_xbt_dynar_t d;
- MC_process_read_simple(process, &d, remote_dynar, sizeof(d));
+ process->read_bytes(&d, sizeof(d), remote(remote_dynar));
if (i >= d.used)
xbt_die("Out of bound index %zi/%lu", i, d.used);
if (len != d.elmsize)
xbt_die("Bad size in MC_process_read_dynar_element");
- MC_process_read_simple(process, local, xbt_dynar_get_ptr(&d, i), len);
+ process->read_bytes(local, len, remote(xbt_dynar_get_ptr(&d, i)));
return local;
}
-void MC_process_write(mc_process_t process, const void* local, void* remote, size_t len)
-{
- if (process->is_self()) {
- memcpy(remote, local, len);
- } else {
- if (pwrite_whole(process->memory_file, local, len, (off_t) remote) < 0)
- xbt_die("Write to process %lli failed", (long long) process->pid);
- }
-}
-
unsigned long MC_process_read_dynar_length(mc_process_t process, const void* remote_dynar)
{
if (!remote_dynar)
return 0;
unsigned long res;
- MC_process_read_simple(process, &res,
- &((xbt_dynar_t)remote_dynar)->used, sizeof(res));
+ process->read_bytes(&res, sizeof(res),
+ remote(&((xbt_dynar_t)remote_dynar)->used));
return res;
}
-static pthread_once_t zero_buffer_flag = PTHREAD_ONCE_INIT;
-static const void* zero_buffer;
-static const size_t zero_buffer_size = 10 * 4096;
-
-static void MC_zero_buffer_init(void)
-{
- int fd = open("/dev/zero", O_RDONLY);
- if (fd<0)
- xbt_die("Could not open /dev/zero");
- zero_buffer = mmap(NULL, zero_buffer_size, PROT_READ, MAP_SHARED, fd, 0);
- if (zero_buffer == MAP_FAILED)
- xbt_die("Could not map the zero buffer");
- close(fd);
-}
-
-void MC_process_clear_memory(mc_process_t process, void* remote, size_t len)
-{
- if (process->is_self()) {
- memset(remote, 0, len);
- } else {
- pthread_once(&zero_buffer_flag, MC_zero_buffer_init);
- while (len) {
- size_t s = len > zero_buffer_size ? zero_buffer_size : len;
- MC_process_write(process, zero_buffer, remote, s);
- remote = (char*) remote + s;
- len -= s;
- }
- }
-}
-
}
#include "mc_private.h"
#include "mc_smx.h"
+using simgrid::mc::remote;
+
extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
// size_t size = size_pointer ? *size_pointer : 0;
size_t size = 0;
if (remote_size)
- MC_process_read_simple(&mc_model_checker->process(), &size,
- remote_size, sizeof(size));
+ mc_model_checker->process().read_bytes(&size, sizeof(size),
+ remote(remote_size));
type = "iRecv";
char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
s_smx_synchro_t synchro;
smx_synchro_t act;
if (use_remote_comm) {
- MC_process_read_simple(&mc_model_checker->process(), &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
act = &synchro;
} else
act = remote_act;
s_smx_synchro_t synchro;
smx_synchro_t act;
if (use_remote_comm) {
- MC_process_read_simple(&mc_model_checker->process(), &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
act = &synchro;
} else
act = remote_act;
case SIMCALL_COMM_WAITANY: {
type = "WaitAny";
s_xbt_dynar_t comms;
- MC_process_read_simple(&mc_model_checker->process(),
- &comms, simcall_comm_waitany__get__comms(req), sizeof(comms));
+ mc_model_checker->process().read_bytes(
+ &comms, sizeof(comms), remote(simcall_comm_waitany__get__comms(req)));
if (!xbt_dynar_is_empty(&comms)) {
smx_synchro_t remote_sync;
MC_process_read_dynar_element(&mc_model_checker->process(),
type = "Mutex LOCK";
s_smx_mutex_t mutex;
- MC_process_read_simple(&mc_model_checker->process(), &mutex,
- simcall_mutex_lock__get__mutex(req), sizeof(mutex));
+ mc_model_checker->process().read_bytes(&mutex, sizeof(mutex),
+ remote(simcall_mutex_lock__get__mutex(req)));
s_xbt_swag_t mutex_sleeping;
- MC_process_read_simple(&mc_model_checker->process(), &mutex_sleeping,
- mutex.sleeping, sizeof(mutex_sleeping));
+ mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping),
+ remote(mutex.sleeping));
args = bprintf("locked = %d, owner = %d, sleeping = %d",
mutex.locked,
// Read the dynar:
s_xbt_dynar_t comms;
- MC_process_read_simple(&mc_model_checker->process(),
- &comms, simcall_comm_testany__get__comms(req), sizeof(comms));
+ mc_model_checker->process().read_bytes(
+ &comms, sizeof(comms), remote(simcall_comm_testany__get__comms(req)));
// Read ther dynar buffer:
size_t buffer_size = comms.elmsize * comms.used;
char buffer[buffer_size];
- MC_process_read_simple(&mc_model_checker->process(),
- buffer, comms.data, buffer_size);
+ mc_model_checker->process().read_bytes(
+ buffer, buffer_size, remote(comms.data));
// Iterate over the elements:
assert(comms.elmsize == sizeof(smx_synchro_t));
// Dereference the pointer:
s_smx_synchro_t action;
- MC_process_read_simple(&mc_model_checker->process(),
- &action, remote_action, sizeof(action));
+ mc_model_checker->process().read_bytes(
+ &action, sizeof(action), remote(remote_action));
// Finally so something useful about it:
if (action.comm.src_proc && action.comm.dst_proc)
}
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process(),
- &synchro, remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(
+ &synchro, sizeof(synchro), remote(remote_act));
return synchro.comm.src_proc && synchro.comm.dst_proc;
}
} else {
smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process(), &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
case SIMCALL_COMM_TEST: {
smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process(), &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) {
if (issuer->smx_host)
label =
