#include "src/mc/ModelChecker.hpp"
#include "src/mc/Session.hpp"
-#include "src/mc/Transition.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/remote/RemoteProcess.hpp"
+#include "src/mc/transition/TransitionComm.hpp"
#include "xbt/automaton.hpp"
#include "xbt/system_error.hpp"
XBT_INFO("Counter-example execution trace:");
for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
XBT_INFO(" %s", s.c_str());
- dumpRecordPath();
+ XBT_INFO("Path = %s", mc_model_checker->getChecker()->get_record_trace().to_string().c_str());
session_singleton->log_state();
if (xbt_log_no_loc) {
XBT_INFO("Stack trace not displayed because you passed --log=no_loc");
XBT_INFO("Counter-example execution trace:");
for (auto const& s : getChecker()->get_textual_trace())
XBT_INFO(" %s", s.c_str());
- dumpRecordPath();
+ XBT_INFO("Path = %s", getChecker()->get_record_trace().to_string().c_str());
session_singleton->log_state();
this->exit(SIMGRID_MC_EXIT_SAFETY);
checker_side_.dispatch();
}
-void ModelChecker::handle_simcall(Transition const& transition)
+Transition* ModelChecker::handle_simcall(aid_t aid, int times_considered, bool new_transition)
{
- s_mc_message_simcall_handle_t m;
+ s_mc_message_simcall_execute_t m;
memset(&m, 0, sizeof(m));
- m.type = MessageType::SIMCALL_HANDLE;
- m.aid_ = transition.aid_;
- m.times_considered_ = transition.times_considered_;
+ m.type = MessageType::SIMCALL_EXECUTE;
+ m.aid_ = aid;
+ m.times_considered_ = times_considered;
checker_side_.get_channel().send(m);
+
this->remote_process_->clear_cache();
if (this->remote_process_->running())
- checker_side_.dispatch();
+ checker_side_.dispatch(); // The app may send messages while processing the transition
+
+ s_mc_message_simcall_execute_answer_t answer;
+ ssize_t s = checker_side_.get_channel().receive(answer);
+ xbt_assert(s != -1, "Could not receive message");
+ xbt_assert(s == sizeof(answer) && answer.type == MessageType::SIMCALL_EXECUTE_ANSWER,
+ "Received unexpected message %s (%i, size=%i) "
+ "expected MessageType::SIMCALL_EXECUTE_ANSWER (%i, size=%i)",
+ to_c_str(answer.type), (int)answer.type, (int)s, (int)MessageType::SIMCALL_EXECUTE_ANSWER,
+ (int)sizeof(answer));
+
+ if (new_transition) {
+ std::stringstream stream(answer.buffer.data());
+ return deserialize_transition(aid, times_considered, stream);
+ } else
+ return nullptr;
}
bool ModelChecker::simcall_is_visible(aid_t aid)
{
return answer.value;
}
-std::string ModelChecker::simcall_to_string(MessageType type, aid_t aid, int times_considered)
-{
- xbt_assert(mc_model_checker != nullptr, "This should be called from the checker side");
-
- s_mc_message_simcall_to_string_t m;
- memset(&m, 0, sizeof(m));
- m.type = type;
- m.aid = aid;
- m.time_considered = times_considered;
- checker_side_.get_channel().send(m);
-
- s_mc_message_simcall_to_string_answer_t answer;
- ssize_t s = checker_side_.get_channel().receive(answer);
- xbt_assert(s != -1, "Could not receive message");
- xbt_assert(s == sizeof(answer) && answer.type == MessageType::SIMCALL_TO_STRING_ANSWER,
- "Received unexpected message %s (%i, size=%i) "
- "expected MessageType::SIMCALL_TO_STRING_ANSWER (%i, size=%i)",
- to_c_str(answer.type), (int)answer.type, (int)s, (int)MessageType::SIMCALL_TO_STRING_ANSWER,
- (int)sizeof(answer));
-
- return std::string(answer.value);
-}
-
-std::string ModelChecker::simcall_to_string(aid_t aid, int times_considered)
-{
- std::string answer = simcall_to_string(MessageType::SIMCALL_TO_STRING, aid, times_considered);
- XBT_DEBUG("to_string(%ld) is returning %s", aid, answer.c_str());
- return answer;
-}
-
-std::string ModelChecker::simcall_dot_label(aid_t aid, int times_considered)
-{
- std::string answer = simcall_to_string(MessageType::SIMCALL_DOT_LABEL, aid, times_considered);
- XBT_DEBUG("dot_label(%ld) is returning %s", aid, answer.c_str());
- return answer;
-}
-
void ModelChecker::finalize_app(bool terminate_asap)
{
s_mc_message_int_t m;