-/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2021. 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 "src/mc/checker/CommunicationDeterminismChecker.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
-#include "src/mc/Session.hpp"
-#include "src/mc/mc_api.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
#include <cstdint>
-using simgrid::mc::remote;
using mcapi = simgrid::mc::mc_api;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection");
return CommPatternDifference::NONE;
}
-static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, int process,
+static void patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& dest,
+ std::vector<simgrid::mc::PatternCommunication> const& source)
+{
+ dest.clear();
+ for (simgrid::mc::PatternCommunication const& comm : source) {
+ auto* copy_comm = new simgrid::mc::PatternCommunication(comm.dup());
+ dest.push_back(copy_comm);
+ }
+}
+
+static void restore_communications_pattern(simgrid::mc::State* state)
+{
+ for (size_t i = 0; i < initial_communications_pattern.size(); i++)
+ initial_communications_pattern[i].index_comm = state->communication_indices_[i];
+
+ for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++)
+ patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]);
+}
+
+static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, aid_t process,
const simgrid::mc::PatternCommunication* comm, unsigned int cursor)
{
char* type;
char* res;
if (comm->type == simgrid::mc::PatternCommunicationType::send)
- type = bprintf("The send communications pattern of the process %d is different!", process - 1);
+ type = bprintf("The send communications pattern of the process %ld is different!", process - 1);
else
- type = bprintf("The recv communications pattern of the process %d is different!", process - 1);
+ type = bprintf("The recv communications pattern of the process %ld is different!", process - 1);
using simgrid::mc::CommPatternDifference;
switch (diff) {
}
static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern,
- simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr)
+ const simgrid::kernel::activity::CommImpl* comm_addr)
{
auto src_proc = mcapi::get().get_src_actor(comm_addr);
auto dst_proc = mcapi::get().get_dst_actor(comm_addr);
comm_pattern->src_host = mcapi::get().get_actor_host_name(src_proc);
comm_pattern->dst_host = mcapi::get().get_actor_host_name(dst_proc);
- if (comm_pattern->data.empty()) {
- auto pattern_data = mcapi::get().get_pattern_comm_data(comm_addr);
- if (pattern_data.data() != nullptr) {
- auto data_size = pattern_data.size();
- comm_pattern->data.resize(data_size);
- memcpy(comm_pattern->data.data(), pattern_data.data(), data_size);
- }
- }
+ if (comm_pattern->data.empty())
+ comm_pattern->data = mcapi::get().get_pattern_comm_data(comm_addr);
}
namespace simgrid {
namespace mc {
-void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, const PatternCommunication* comm,
+void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, const PatternCommunication* comm,
int backtracking)
{
if (not backtracking) {
#if HAVE_SMPI
pattern->tag = mcapi::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND);
#endif
- auto pattern_data = mcapi::get().get_pattern_comm_data(pattern->comm_addr);
- if (pattern_data.data() != nullptr) {
- auto data_size = pattern_data.size();
- pattern->data.resize(data_size);
- memcpy(pattern->data.data(), pattern_data.data(), data_size);
- }
+ pattern->data = mcapi::get().get_pattern_comm_data(pattern->comm_addr);
#if HAVE_SMPI
auto send_detached = mcapi::get().check_send_request_detached(request);
incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release());
}
-void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr<kernel::activity::CommImpl> comm_addr,
- unsigned int issuer, int backtracking)
+void CommunicationDeterminismChecker::complete_comm_pattern(const kernel::activity::CommImpl* comm_addr, aid_t issuer,
+ int backtracking)
{
/* Complete comm pattern */
std::vector<PatternCommunication*>& incomplete_pattern = incomplete_communications_pattern[issuer];
update_comm_pattern(*current_comm_pattern, comm_addr);
std::unique_ptr<PatternCommunication> comm_pattern(*current_comm_pattern);
- XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %zd", issuer,
+ XBT_DEBUG("Remove incomplete comm pattern for process %ld at cursor %zd", issuer,
std::distance(begin(incomplete_pattern), current_comm_pattern));
incomplete_pattern.erase(current_comm_pattern);
}
}
-CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& s) : Checker(s) {}
+CommunicationDeterminismChecker::CommunicationDeterminismChecker() : Checker() {}
CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default;
void CommunicationDeterminismChecker::prepare()
{
- const int maxpid = mcapi::get().get_maxpid();
+ const auto maxpid = mcapi::get().get_maxpid();
initial_communications_pattern.resize(maxpid);
incomplete_communications_pattern.resize(maxpid);
State* last_state = stack_.back().get();
if (last_state->system_state_) {
mc_api::get().restore_state(last_state->system_state_);
- MC_restore_communications_pattern(last_state);
+ restore_communications_pattern(last_state);
return;
}
/* Restore the initial state */
mcapi::get().restore_initial_state();
- unsigned n = mcapi::get().get_maxpid();
+ unsigned long n = mcapi::get().get_maxpid();
assert(n == incomplete_communications_pattern.size());
assert(n == initial_communications_pattern.size());
- for (unsigned j = 0; j < n; j++) {
+ for (unsigned long j = 0; j < n; j++) {
incomplete_communications_pattern[j].clear();
initial_communications_pattern[j].index_comm = 0;
}
break;
case CallType::WAIT:
case CallType::WAITANY: {
- simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr{nullptr};
+ const simgrid::kernel::activity::CommImpl* comm_addr = nullptr;
if (call_type == CallType::WAIT)
comm_addr = mcapi::get().get_comm_wait_raw_addr(req);
else
void CommunicationDeterminismChecker::run()
{
XBT_INFO("Check communication determinism");
- mcapi::get().s_initialize();
+ mcapi::get().session_initialize();
this->prepare();
this->real_run();
}
-Checker* createCommunicationDeterminismChecker(Session& s)
+Checker* createCommunicationDeterminismChecker()
{
- return new CommunicationDeterminismChecker(s);
+ return new CommunicationDeterminismChecker();
}
} // namespace mc
