static char *buff_size_to_string(size_t size);
static inline
-simgrid::simix::Comm* MC_get_comm(smx_simcall_t r)
+simgrid::kernel::activity::Comm* MC_get_comm(smx_simcall_t r)
{
switch (r->call ) {
case SIMCALL_COMM_WAIT:
- return static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(r));
+ return static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(r));
case SIMCALL_COMM_TEST:
- return static_cast<simgrid::simix::Comm*>(simcall_comm_test__get__comm(r));
+ return static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_test__get__comm(r));
default:
return nullptr;
}
// Those are internal requests, we do not need indirection
// because those objects are copies:
- simgrid::simix::Comm* synchro1 = MC_get_comm(r1);
- simgrid::simix::Comm* synchro2 = MC_get_comm(r2);
+ simgrid::kernel::activity::Comm* synchro1 = MC_get_comm(r1);
+ simgrid::kernel::activity::Comm* synchro2 = MC_get_comm(r2);
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT) {
// Those are internal requests, we do not need indirection
// because those objects are copies:
- simgrid::simix::Comm* synchro1 = MC_get_comm(r1);
- simgrid::simix::Comm* synchro2 = MC_get_comm(r2);
+ simgrid::kernel::activity::Comm* synchro1 = MC_get_comm(r1);
+ simgrid::kernel::activity::Comm* synchro2 = MC_get_comm(r2);
switch(r1->call) {
case SIMCALL_COMM_ISEND:
const char* type = nullptr;
char *args = nullptr;
- smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+ smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
}
case SIMCALL_COMM_WAIT: {
- simgrid::simix::Comm* remote_act =
- static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::Comm* remote_act =
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
char* p;
if (value == -1) {
type = "WaitTimeout";
type = "Wait";
p = pointer_to_string(remote_act);
- simgrid::mc::Remote<simgrid::simix::Comm> temp_synchro;
- simgrid::simix::Comm* act;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_synchro;
+ simgrid::kernel::activity::Comm* act;
if (use_remote_comm) {
mc_model_checker->process().read(temp_synchro, remote(
- static_cast<simgrid::simix::Comm*>(remote_act)));
+ static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
act = temp_synchro.getBuffer();
} else
act = remote_act;
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(act->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(act->dst_proc));
args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
src_proc ? src_proc->pid : 0,
}
case SIMCALL_COMM_TEST: {
- simgrid::simix::Comm* remote_act = static_cast<simgrid::simix::Comm*>(
+ simgrid::kernel::activity::Comm* remote_act = static_cast<simgrid::kernel::activity::Comm*>(
simcall_comm_test__get__comm(req));
- simgrid::mc::Remote<simgrid::simix::Comm> temp_synchro;
- simgrid::simix::Comm* act;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_synchro;
+ simgrid::kernel::activity::Comm* act;
if (use_remote_comm) {
mc_model_checker->process().read(temp_synchro, remote(
- static_cast<simgrid::simix::Comm*>(remote_act)));
+ static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
act = temp_synchro.getBuffer();
} else
act = remote_act;
type = "Test TRUE";
p = pointer_to_string(remote_act);
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(act->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(act->dst_proc));
args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
src_proc->pid,
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;
+ smx_activity_t remote_sync;
read_element(mc_model_checker->process(),
&remote_sync, remote(simcall_comm_waitany__get__comms(req)), value,
sizeof(remote_sync));
bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
{
- smx_synchro_t remote_act = nullptr;
+ smx_activity_t remote_act = nullptr;
switch (req->call) {
case SIMCALL_COMM_WAIT:
return true;
}
- simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
mc_model_checker->process().read(temp_comm, remote(
- static_cast<simgrid::simix::Comm*>(remote_act)));
- simgrid::simix::Comm* comm = temp_comm.getBuffer();
+ static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
+ simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
return comm->src_proc && comm->dst_proc;
}
-bool process_is_enabled(smx_process_t process)
+bool process_is_enabled(smx_actor_t process)
{
return simgrid::mc::request_is_enabled(&process->simcall);
}
{
std::string label;
- const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+ const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
else
label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid);
} else {
- smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
- simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ smx_activity_t remote_act = simcall_comm_wait__get__comm(req);
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
mc_model_checker->process().read(temp_comm, remote(
- static_cast<simgrid::simix::Comm*>(remote_act)));
- simgrid::simix::Comm* comm = temp_comm.getBuffer();
+ static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
+ simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
- smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(comm->src_proc));
- smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+ smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
simgrid::mc::remote(comm->dst_proc));
if (issuer->host)
label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]",
}
case SIMCALL_COMM_TEST: {
- smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
- simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ smx_activity_t remote_act = simcall_comm_test__get__comm(req);
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
mc_model_checker->process().read(temp_comm, remote(
- static_cast<simgrid::simix::Comm*>(remote_act)));
- simgrid::simix::Comm* comm = temp_comm.getBuffer();
+ static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
+ simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
if (comm->src_proc == nullptr || comm->dst_proc == nullptr) {
if (issuer->host)
label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE",