-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */
/* 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 <cstdint>
-
-#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
-#include "src/mc/Transition.hpp"
-#include "src/mc/VisitedState.hpp"
#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
+#include "src/kernel/activity/MailboxImpl.hpp"
+#include "src/mc/VisitedState.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_state.hpp"
#include "src/mc/remote/Client.hpp"
+#if HAVE_SMPI
#include "smpi_request.hpp"
+#endif
+
+#include <cstdint>
using simgrid::mc::remote;
/********** Global variables **********/
-xbt_dynar_t initial_communications_pattern;
-xbt_dynar_t incomplete_communications_pattern;
+std::vector<simgrid::mc::PatternCommunicationList> initial_communications_pattern;
+std::vector<std::vector<simgrid::mc::PatternCommunication*>> incomplete_communications_pattern;
/********** Static functions ***********/
mc_model_checker->process().read(temp_comm, comm_addr);
simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
- smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_proc));
- smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_proc));
- comm_pattern->src_proc = src_proc->pid;
- comm_pattern->dst_proc = dst_proc->pid;
+ 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()));
+ 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);
comm_pattern->dst_host = MC_smx_actor_get_host_name(dst_proc);
- if (comm_pattern->data.size() == 0 && comm->src_buff != nullptr) {
+ if (comm_pattern->data.size() == 0 && comm->src_buff_ != nullptr) {
size_t buff_size;
- mc_model_checker->process().read(&buff_size, remote(comm->dst_buff_size));
+ mc_model_checker->process().read(&buff_size, remote(comm->dst_buff_size_));
comm_pattern->data.resize(buff_size);
mc_model_checker->process().read_bytes(comm_pattern->data.data(), comm_pattern->data.size(),
- remote(comm->src_buff));
+ remote(comm->src_buff_));
}
}
void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, simgrid::mc::PatternCommunication* comm,
int backtracking)
{
- simgrid::mc::PatternCommunicationList* list =
- xbt_dynar_get_as(initial_communications_pattern, process, simgrid::mc::PatternCommunicationList*);
+ simgrid::mc::PatternCommunicationList& list = initial_communications_pattern[process];
if (not backtracking) {
- e_mc_comm_pattern_difference_t diff = compare_comm_pattern(list->list[list->index_comm].get(), comm);
+ e_mc_comm_pattern_difference_t diff = compare_comm_pattern(list.list[list.index_comm].get(), comm);
if (diff != NONE_DIFF) {
if (comm->type == simgrid::mc::PatternCommunicationType::send) {
this->send_deterministic = 0;
if (this->send_diff != nullptr)
xbt_free(this->send_diff);
- this->send_diff = print_determinism_result(diff, process, comm, list->index_comm + 1);
+ this->send_diff = print_determinism_result(diff, process, comm, list.index_comm + 1);
} else {
this->recv_deterministic = 0;
if (this->recv_diff != nullptr)
xbt_free(this->recv_diff);
- this->recv_diff = print_determinism_result(diff, process, comm, list->index_comm + 1);
+ this->recv_diff = print_determinism_result(diff, process, comm, list.index_comm + 1);
}
if (_sg_mc_send_determinism && not this->send_deterministic) {
XBT_INFO("*********************************************************");
/********** Non Static functions ***********/
-void CommunicationDeterminismChecker::get_comm_pattern(xbt_dynar_t list, smx_simcall_t request,
- e_mc_call_type_t call_type, int backtracking)
+void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_mc_call_type_t call_type,
+ int backtracking)
{
const smx_actor_t issuer = MC_smx_simcall_get_issuer(request);
- simgrid::mc::PatternCommunicationList* initial_pattern =
- xbt_dynar_get_as(initial_communications_pattern, issuer->pid, simgrid::mc::PatternCommunicationList*);
- xbt_dynar_t incomplete_pattern = xbt_dynar_get_as(incomplete_communications_pattern, issuer->pid, xbt_dynar_t);
+ const simgrid::mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()];
+ const std::vector<simgrid::mc::PatternCommunication*>& incomplete_pattern =
+ incomplete_communications_pattern[issuer->get_pid()];
- std::unique_ptr<simgrid::mc::PatternCommunication> pattern =
- std::unique_ptr<simgrid::mc::PatternCommunication>(new simgrid::mc::PatternCommunication());
- pattern->index = initial_pattern->index_comm + xbt_dynar_length(incomplete_pattern);
+ std::unique_ptr<simgrid::mc::PatternCommunication> pattern(new simgrid::mc::PatternCommunication());
+ pattern->index = initial_pattern.index_comm + incomplete_pattern.size();
if (call_type == MC_CALL_TYPE_SEND) {
/* Create comm pattern */
char* remote_name = mc_model_checker->process().read<char*>(
RemotePtr<char*>((uint64_t)(synchro->mbox ? &synchro->mbox->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_proc))->pid;
+ pattern->src_proc =
+ mc_model_checker->process().resolveActor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid();
pattern->src_host = MC_smx_actor_get_host_name(issuer);
- simgrid::smpi::Request mpi_request = mc_model_checker->process().read<simgrid::smpi::Request>(
- RemotePtr<simgrid::smpi::Request>((std::uint64_t)simcall_comm_isend__get__data(request)));
+#if HAVE_SMPI
+ simgrid::smpi::Request mpi_request;
+ mc_model_checker->process().read(
+ &mpi_request, remote(static_cast<simgrid::smpi::Request*>(simcall_comm_isend__get__data(request))));
pattern->tag = mpi_request.tag();
+#endif
- if (synchro->src_buff != nullptr) {
- pattern->data.resize(synchro->src_buff_size);
- mc_model_checker->process().read_bytes(pattern->data.data(), pattern->data.size(), remote(synchro->src_buff));
+ if (synchro->src_buff_ != nullptr) {
+ pattern->data.resize(synchro->src_buff_size_);
+ mc_model_checker->process().read_bytes(pattern->data.data(), pattern->data.size(), remote(synchro->src_buff_));
}
+#if HAVE_SMPI
if(mpi_request.detached()){
if (not this->initial_communications_pattern_done) {
/* Store comm pattern */
- simgrid::mc::PatternCommunicationList* list =
- xbt_dynar_get_as(initial_communications_pattern, pattern->src_proc, simgrid::mc::PatternCommunicationList*);
- list->list.push_back(std::move(pattern));
+ initial_communications_pattern[pattern->src_proc].list.push_back(std::move(pattern));
} else {
/* Evaluate comm determinism */
this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking);
- xbt_dynar_get_as(initial_communications_pattern, pattern->src_proc, simgrid::mc::PatternCommunicationList*)
- ->index_comm++;
+ initial_communications_pattern[pattern->src_proc].index_comm++;
}
return;
}
+#endif
} else if (call_type == MC_CALL_TYPE_RECV) {
pattern->type = simgrid::mc::PatternCommunicationType::receive;
pattern->comm_addr = static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_irecv__getraw__result(request));
+#if HAVE_SMPI
simgrid::smpi::Request mpi_request;
- mc_model_checker->process().read(&mpi_request,
- remote((simgrid::smpi::Request*)simcall_comm_irecv__get__data(request)));
+ mc_model_checker->process().read(
+ &mpi_request, remote(static_cast<simgrid::smpi::Request*>(simcall_comm_irecv__get__data(request))));
pattern->tag = mpi_request.tag();
+#endif
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
mc_model_checker->process().read(temp_comm,
&remote_name, remote(comm->mbox ? &simgrid::xbt::string::to_string_data(comm->mbox->name_).data
: &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_proc))->pid;
+ pattern->dst_proc =
+ mc_model_checker->process().resolveActor(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);
- XBT_DEBUG("Insert incomplete comm pattern %p for process %ld", pattern.get(), issuer->pid);
- xbt_dynar_t dynar = xbt_dynar_get_as(incomplete_communications_pattern, issuer->pid, xbt_dynar_t);
- simgrid::mc::PatternCommunication* pattern2 = pattern.release();
- xbt_dynar_push(dynar, &pattern2);
+ XBT_DEBUG("Insert incomplete comm pattern %p for process %ld", pattern.get(), issuer->get_pid());
+ incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release());
}
void CommunicationDeterminismChecker::complete_comm_pattern(
- xbt_dynar_t list, simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr, unsigned int issuer,
- int backtracking)
+ simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr, unsigned int issuer, int backtracking)
{
- simgrid::mc::PatternCommunication* current_comm_pattern;
- unsigned int cursor = 0;
- std::unique_ptr<simgrid::mc::PatternCommunication> comm_pattern;
- int completed = 0;
-
/* Complete comm pattern */
- xbt_dynar_foreach(xbt_dynar_get_as(incomplete_communications_pattern, issuer, xbt_dynar_t), cursor, current_comm_pattern)
- if (remote(current_comm_pattern->comm_addr) == comm_addr) {
- update_comm_pattern(current_comm_pattern, comm_addr);
- completed = 1;
- simgrid::mc::PatternCommunication* temp;
- xbt_dynar_remove_at(xbt_dynar_get_as(incomplete_communications_pattern, issuer, xbt_dynar_t), cursor, &temp);
- comm_pattern = std::unique_ptr<simgrid::mc::PatternCommunication>(temp);
- XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %u", issuer, cursor);
- break;
- }
-
- if (not completed)
+ std::vector<simgrid::mc::PatternCommunication*>& incomplete_pattern = incomplete_communications_pattern[issuer];
+ auto current_comm_pattern = std::find_if(
+ begin(incomplete_pattern), end(incomplete_pattern),
+ [&comm_addr](simgrid::mc::PatternCommunication* comm) { return remote(comm->comm_addr) == comm_addr; });
+ if (current_comm_pattern == std::end(incomplete_pattern))
xbt_die("Corresponding communication not found!");
- simgrid::mc::PatternCommunicationList* pattern =
- xbt_dynar_get_as(initial_communications_pattern, issuer, simgrid::mc::PatternCommunicationList*);
+ update_comm_pattern(*current_comm_pattern, comm_addr);
+ std::unique_ptr<simgrid::mc::PatternCommunication> comm_pattern(*current_comm_pattern);
+ XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %zd", issuer,
+ std::distance(begin(incomplete_pattern), current_comm_pattern));
+ incomplete_pattern.erase(current_comm_pattern);
if (not this->initial_communications_pattern_done)
/* Store comm pattern */
- pattern->list.push_back(std::move(comm_pattern));
+ initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern));
else {
/* Evaluate comm determinism */
this->deterministic_comm_pattern(issuer, comm_pattern.get(), backtracking);
- pattern->index_comm++;
+ initial_communications_pattern[issuer].index_comm++;
}
}
-CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& session) : Checker(session)
+CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& s) : Checker(s)
{
}
{
const int maxpid = MC_smx_get_maxpid();
- // Create initial_communications_pattern elements:
- initial_communications_pattern = simgrid::xbt::newDeleteDynar<simgrid::mc::PatternCommunicationList*>();
- for (int i = 0; i < maxpid; i++) {
- simgrid::mc::PatternCommunicationList* process_list_pattern = new simgrid::mc::PatternCommunicationList();
- xbt_dynar_insert_at(initial_communications_pattern, i, &process_list_pattern);
- }
-
- // Create incomplete_communications_pattern elements:
- incomplete_communications_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
- for (int i = 0; i < maxpid; i++) {
- xbt_dynar_t process_pattern = xbt_dynar_new(sizeof(simgrid::mc::PatternCommunication*), nullptr);
- xbt_dynar_insert_at(incomplete_communications_pattern, i, &process_pattern);
- }
+ 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(++expandedStatesCount_));
static inline bool all_communications_are_finished()
{
for (size_t current_actor = 1; current_actor < MC_smx_get_maxpid(); current_actor++) {
- xbt_dynar_t pattern = xbt_dynar_get_as(incomplete_communications_pattern, current_actor, xbt_dynar_t);
- if (not xbt_dynar_is_empty(pattern)) {
+ if (not incomplete_communications_pattern[current_actor].empty()) {
XBT_DEBUG("Some communications are not finished, cannot stop the exploration! State not visited.");
return false;
}
void CommunicationDeterminismChecker::restoreState()
{
/* Intermediate backtracking */
- simgrid::mc::State* state = stack_.back().get();
- if (state->system_state) {
- simgrid::mc::restore_snapshot(state->system_state);
- MC_restore_communications_pattern(state);
+ simgrid::mc::State* last_state = stack_.back().get();
+ if (last_state->system_state) {
+ simgrid::mc::restore_snapshot(last_state->system_state);
+ MC_restore_communications_pattern(last_state);
return;
}
simgrid::mc::session->restoreInitialState();
unsigned n = MC_smx_get_maxpid();
- assert(n == xbt_dynar_length(incomplete_communications_pattern));
- assert(n == xbt_dynar_length(initial_communications_pattern));
+ assert(n == incomplete_communications_pattern.size());
+ assert(n == initial_communications_pattern.size());
for (unsigned j=0; j < n ; j++) {
- xbt_dynar_reset((xbt_dynar_t)xbt_dynar_get_as(incomplete_communications_pattern, j, xbt_dynar_t));
- xbt_dynar_get_as(initial_communications_pattern, j, simgrid::mc::PatternCommunicationList*)->index_comm = 0;
+ incomplete_communications_pattern[j].clear();
+ initial_communications_pattern[j].index_comm = 0;
}
/* Traverse the stack from the state at position start and re-execute the transitions */
/* TODO : handle test and testany simcalls */
e_mc_call_type_t call = MC_get_call_type(req);
mc_model_checker->handle_simcall(state->transition);
- MC_handle_comm_pattern(call, req, req_num, nullptr, 1);
+ MC_handle_comm_pattern(call, req, req_num, 1);
mc_model_checker->wait_for_requests();
/* Update statistics */
}
}
-void CommunicationDeterminismChecker::main()
+void CommunicationDeterminismChecker::real_run()
{
std::unique_ptr<simgrid::mc::VisitedState> visited_state = nullptr;
smx_simcall_t req = nullptr;
while (not stack_.empty()) {
/* Get current state */
- simgrid::mc::State* state = stack_.back().get();
+ simgrid::mc::State* cur_state = stack_.back().get();
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), state->num,
- state->interleaveSize());
+ XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num,
+ cur_state->interleaveSize());
/* Update statistics */
mc_model_checker->visited_states++;
if (stack_.size() <= (std::size_t)_sg_mc_max_depth)
- req = MC_state_get_request(state);
+ req = MC_state_get_request(cur_state);
else
req = nullptr;
if (req != nullptr && visited_state == nullptr) {
- int req_num = state->transition.argument;
+ int req_num = cur_state->transition.argument;
XBT_DEBUG("Execute: %s", simgrid::mc::request_to_string(req, req_num, simgrid::mc::RequestType::simix).c_str());
call = MC_get_call_type(req);
/* Answer the request */
- mc_model_checker->handle_simcall(state->transition);
+ mc_model_checker->handle_simcall(cur_state->transition);
/* After this call req is no longer useful */
- if (not this->initial_communications_pattern_done)
- MC_handle_comm_pattern(call, req, req_num, initial_communications_pattern, 0);
- else
- MC_handle_comm_pattern(call, req, req_num, nullptr, 0);
+ MC_handle_comm_pattern(call, req, req_num, 0);
/* Wait for requests (schedules processes) */
mc_model_checker->wait_for_requests();
next_state->addInterleavingSet(actor.copy.getBuffer());
if (dot_output != nullptr)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
- state->num, next_state->num, req_str.c_str());
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num, next_state->num, req_str.c_str());
} else if (dot_output != nullptr)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num,
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num,
visited_state->original_num == -1 ? visited_state->num : visited_state->original_num, req_str.c_str());
stack_.push_back(std::move(next_state));
this->initial_communications_pattern_done = 1;
/* Trash the current state, no longer needed */
- XBT_DEBUG("Delete state %d at depth %zu", state->num, stack_.size());
+ XBT_DEBUG("Delete state %d at depth %zu", cur_state->num, stack_.size());
stack_.pop_back();
visited_state = nullptr;
this->prepare();
- this->main();
+ this->real_run();
}
-Checker* createCommunicationDeterminismChecker(Session& session)
+Checker* createCommunicationDeterminismChecker(Session& s)
{
- return new CommunicationDeterminismChecker(session);
+ return new CommunicationDeterminismChecker(s);
}
}
