/* 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 <xbt/log.h>
+#include <xbt/str.h>
+#include <xbt/sysdep.h>
+#include <xbt/dynar.h>
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
}
static inline
-smx_rdv_t MC_get_rdv(smx_simcall_t r)
+smx_mailbox_t MC_get_rdv(smx_simcall_t r)
{
switch(r->call) {
case SIMCALL_COMM_ISEND:
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT) {
- smx_rdv_t rdv = MC_get_rdv(r1);
+ smx_mailbox_t rdv = MC_get_rdv(r1);
if (rdv != synchro2->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r2) <= 0)
if (r1->call == SIMCALL_COMM_WAIT
&& (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
- && (synchro1->comm.src_proc == NULL || synchro1->comm.dst_proc == NULL))
+ && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL))
return FALSE;
if (r1->call == SIMCALL_COMM_TEST &&
- (simcall_comm_test__get__comm(r1) == NULL
- || synchro1->comm.src_buff == NULL
- || synchro1->comm.dst_buff == NULL))
+ (simcall_comm_test__get__comm(r1) == nullptr
+ || synchro1->comm.src_buff == nullptr
+ || synchro1->comm.dst_buff == nullptr))
return FALSE;
if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
- && synchro1->comm.src_buff != NULL
- && synchro1->comm.dst_buff != NULL
- && synchro2->comm.src_buff != NULL
- && synchro2->comm.dst_buff != NULL
+ && synchro1->comm.src_buff != nullptr
+ && synchro1->comm.dst_buff != nullptr
+ && synchro2->comm.src_buff != nullptr
+ && synchro2->comm.dst_buff != nullptr
&& synchro1->comm.dst_buff != synchro2->comm.src_buff
&& synchro1->comm.dst_buff != synchro2->comm.dst_buff
&& synchro2->comm.dst_buff != synchro1->comm.src_buff)
if (synchro1->comm.src_buff == synchro2->comm.src_buff
&& synchro1->comm.dst_buff == synchro2->comm.dst_buff)
return FALSE;
- else if (synchro1->comm.src_buff != NULL
- && synchro1->comm.dst_buff != NULL
- && synchro2->comm.src_buff != NULL
- && synchro2->comm.dst_buff != NULL
+ else if (synchro1->comm.src_buff != nullptr
+ && synchro1->comm.dst_buff != nullptr
+ && synchro2->comm.src_buff != nullptr
+ && synchro2->comm.dst_buff != nullptr
&& synchro1->comm.dst_buff != synchro2->comm.src_buff
&& synchro1->comm.dst_buff != synchro2->comm.dst_buff
&& synchro2->comm.dst_buff != synchro1->comm.src_buff)
break;
}
- const char* type = NULL;
- char *args = NULL;
+ const char* type = nullptr;
+ char *args = nullptr;
smx_process_t issuer = MC_smx_simcall_get_issuer(req);
act = remote_act;
char* p;
- if (act->comm.src_proc == NULL || act->comm.dst_proc == NULL) {
+ if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) {
type = "Test FALSE";
p = pointer_to_string(remote_act);
args = bprintf("comm=%s", p);
args = bprintf("locked = %d, owner = %d, sleeping = %d",
mutex.locked,
- mutex.owner != NULL ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1,
+ mutex.owner != nullptr ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1,
mutex_sleeping.count);
break;
}
case SIMCALL_MC_SNAPSHOT:
type = "MC_SNAPSHOT";
- args = NULL;
+ args = nullptr;
break;
case SIMCALL_MC_COMPARE_SNAPSHOTS:
type = "MC_COMPARE_SNAPSHOTS";
- args = NULL;
+ args = nullptr;
break;
case SIMCALL_MC_RANDOM:
}
char* str;
- if (args != NULL) {
+ if (args != nullptr) {
str =
bprintf("[(%lu)%s (%s)] %s(%s)", issuer->pid,
MC_smx_process_get_host_name(issuer),
for (cursor=0; cursor != comms.used; ++cursor) {
// Get the element:
- smx_synchro_t remote_action = NULL;
+ smx_synchro_t remote_action = nullptr;
memcpy(&remote_action, buffer + comms.elmsize * cursor, sizeof(remote_action));
// Dereference the pointer:
int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
{
- smx_synchro_t remote_act = NULL;
+ smx_synchro_t remote_act = nullptr;
switch (req->call) {
case SIMCALL_COMM_WAIT:
char *MC_request_get_dot_output(smx_simcall_t req, int value)
{
- char *label = NULL;
+ char *label = nullptr;
const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
s_smx_synchro_t 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 (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) {
if (issuer->host)
label =
bprintf("[(%lu)%s] Test FALSE", issuer->pid,