res = bprintf("%s Different destination for communication #%u", type, cursor);
break;
case DATA_SIZE_DIFF:
- res = bprintf("%s\n Different data size for communication #%u", type, cursor);
+ res = bprintf("%s Different data size for communication #%u", type, cursor);
break;
case DATA_DIFF:
- res = bprintf("%s\n Different data for communication #%u", type, cursor);
+ res = bprintf("%s Different data for communication #%u", type, cursor);
break;
default:
res = nullptr;
// HACK, type punning
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
mc_model_checker->process().read(temp_comm, comm_addr);
- simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
+ simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
- smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_actor_.get()));
- smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_actor_.get()));
+ smx_actor_t src_proc = mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
+ smx_actor_t dst_proc = mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
comm_pattern->src_proc = src_proc->get_pid();
comm_pattern->dst_proc = dst_proc->get_pid();
comm_pattern->src_host = MC_smx_actor_get_host_name(src_proc);
XBT_INFO("****************************************************");
XBT_INFO("***** Non-deterministic communications pattern *****");
XBT_INFO("****************************************************");
- XBT_INFO("%s", this->send_diff);
- XBT_INFO("%s", this->recv_diff);
- xbt_free(this->send_diff);
- this->send_diff = nullptr;
- xbt_free(this->recv_diff);
- this->recv_diff = nullptr;
+ if (this->send_diff) {
+ XBT_INFO("%s", this->send_diff);
+ xbt_free(this->send_diff);
+ this->send_diff = nullptr;
+ }
+ if (this->recv_diff) {
+ XBT_INFO("%s", this->recv_diff);
+ xbt_free(this->recv_diff);
+ this->recv_diff = nullptr;
+ }
simgrid::mc::session->log_state();
mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
}
mc_model_checker->process().read(temp_synchro,
remote(static_cast<simgrid::kernel::activity::CommImpl*>(pattern->comm_addr)));
simgrid::kernel::activity::CommImpl* synchro =
- static_cast<simgrid::kernel::activity::CommImpl*>(temp_synchro.getBuffer());
+ static_cast<simgrid::kernel::activity::CommImpl*>(temp_synchro.get_buffer());
char* remote_name = mc_model_checker->process().read<char*>(RemotePtr<char*>(
(uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->name_ : &synchro->mbox_cpy->name_)));
pattern->rdv = mc_model_checker->process().read_string(RemotePtr<char>(remote_name));
pattern->src_proc =
- mc_model_checker->process().resolveActor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid();
+ mc_model_checker->process().resolve_actor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid();
pattern->src_host = MC_smx_actor_get_host_name(issuer);
#if HAVE_SMPI
}
#if HAVE_SMPI
if(mpi_request.detached()){
- if (not this->initial_communications_pattern_done) {
- /* Store comm pattern */
- initial_communications_pattern[pattern->src_proc].list.push_back(std::move(pattern));
- } else {
+ if (this->initial_communications_pattern_done) {
/* Evaluate comm determinism */
this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking);
initial_communications_pattern[pattern->src_proc].index_comm++;
+ } else {
+ /* Store comm pattern */
+ initial_communications_pattern[pattern->src_proc].list.push_back(std::move(pattern));
}
return;
}
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
mc_model_checker->process().read(temp_comm,
remote(static_cast<simgrid::kernel::activity::CommImpl*>(pattern->comm_addr)));
- simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
+ simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
char* remote_name;
mc_model_checker->process().read(&remote_name,
: &simgrid::xbt::string::to_string_data(comm->mbox_cpy->name_).data));
pattern->rdv = mc_model_checker->process().read_string(RemotePtr<char>(remote_name));
pattern->dst_proc =
- mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid();
+ mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid();
pattern->dst_host = MC_smx_actor_get_host_name(issuer);
} else
xbt_die("Unexpected call_type %i", (int) call_type);
std::distance(begin(incomplete_pattern), current_comm_pattern));
incomplete_pattern.erase(current_comm_pattern);
- if (not this->initial_communications_pattern_done)
- /* Store comm pattern */
- initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern));
- else {
+ if (this->initial_communications_pattern_done) {
/* Evaluate comm determinism */
this->deterministic_comm_pattern(issuer, comm_pattern.get(), backtracking);
initial_communications_pattern[issuer].index_comm++;
+ } else {
+ /* Store comm pattern */
+ initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern));
}
}
void CommunicationDeterminismChecker::log_state() // override
{
- if (_sg_mc_comms_determinism && not this->recv_deterministic && this->send_deterministic) {
- XBT_INFO("******************************************************");
- XBT_INFO("**** Only-send-deterministic communication pattern ****");
- XBT_INFO("******************************************************");
- XBT_INFO("%s", this->recv_diff);
- } else if (_sg_mc_comms_determinism && not this->send_deterministic && this->recv_deterministic) {
- XBT_INFO("******************************************************");
- XBT_INFO("**** Only-recv-deterministic communication pattern ****");
- XBT_INFO("******************************************************");
- XBT_INFO("%s", this->send_diff);
+ if (_sg_mc_comms_determinism) {
+ if (this->send_deterministic && not this->recv_deterministic) {
+ XBT_INFO("*******************************************************");
+ XBT_INFO("**** Only-send-deterministic communication pattern ****");
+ XBT_INFO("*******************************************************");
+ XBT_INFO("%s", this->recv_diff);
+ }
+ if (not this->send_deterministic && this->recv_deterministic) {
+ XBT_INFO("*******************************************************");
+ XBT_INFO("**** Only-recv-deterministic communication pattern ****");
+ XBT_INFO("*******************************************************");
+ XBT_INFO("%s", this->send_diff);
+ }
}
XBT_INFO("Expanded states = %lu", expanded_states_count_);
XBT_INFO("Visited states = %lu", mc_model_checker->visited_states);
XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions);
- XBT_INFO("Send-deterministic : %s", not this->send_deterministic ? "No" : "Yes");
+ XBT_INFO("Send-deterministic : %s", this->send_deterministic ? "Yes" : "No");
if (_sg_mc_comms_determinism)
- XBT_INFO("Recv-deterministic : %s", not this->recv_deterministic ? "No" : "Yes");
+ XBT_INFO("Recv-deterministic : %s", this->recv_deterministic ? "Yes" : "No");
}
void CommunicationDeterminismChecker::prepare()
initial_communications_pattern.resize(maxpid);
incomplete_communications_pattern.resize(maxpid);
- std::unique_ptr<simgrid::mc::State> initial_state =
- std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expanded_states_count_));
+ std::unique_ptr<simgrid::mc::State> initial_state(new simgrid::mc::State(++expanded_states_count_));
XBT_DEBUG("********* Start communication determinism verification *********");
/* Get an enabled actor and insert it in the interleave set of the initial state */
for (auto& actor : mc_model_checker->process().actors())
- if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer()))
- initial_state->addInterleavingSet(actor.copy.getBuffer());
+ if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer()))
+ initial_state->addInterleavingSet(actor.copy.get_buffer());
stack_.push_back(std::move(initial_state));
}
mc_model_checker->wait_for_requests();
/* Create the new expanded state */
- std::unique_ptr<simgrid::mc::State> next_state =
- std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expanded_states_count_));
+ std::unique_ptr<simgrid::mc::State> next_state(new simgrid::mc::State(++expanded_states_count_));
/* If comm determinism verification, we cannot stop the exploration if some communications are not finished (at
* least, data are transferred). These communications are incomplete and they cannot be analyzed and compared
* with the initial pattern. */
- bool compare_snapshots = all_communications_are_finished() && this->initial_communications_pattern_done;
+ bool compare_snapshots = this->initial_communications_pattern_done && all_communications_are_finished();
if (_sg_mc_max_visited_states != 0)
visited_state = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), compare_snapshots);
/* Get enabled actors and insert them in the interleave set of the next state */
for (auto& actor : mc_model_checker->process().actors())
- if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer()))
- next_state->addInterleavingSet(actor.copy.getBuffer());
+ if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer()))
+ next_state->addInterleavingSet(actor.copy.get_buffer());
if (dot_output != nullptr)
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num, next_state->num, req_str.c_str());
else
XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size());
- if (not this->initial_communications_pattern_done)
- this->initial_communications_pattern_done = 1;
+ this->initial_communications_pattern_done = true;
/* Trash the current state, no longer needed */
XBT_DEBUG("Delete state %d at depth %zu", cur_state->num, stack_.size());
}
while (not stack_.empty()) {
- std::unique_ptr<simgrid::mc::State> state = std::move(stack_.back());
+ std::unique_ptr<simgrid::mc::State> state(std::move(stack_.back()));
stack_.pop_back();
if (state->interleaveSize() && stack_.size() < (std::size_t)_sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
