* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/remote/AppSide.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/internal_config.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
s_mc_message_int_t answer{MessageType::DEADLOCK_CHECK_REPLY, deadlock};
xbt_assert(channel_.send(answer) == 0, "Could not send response");
}
-void AppSide::handle_simcall_execute(const s_mc_message_simcall_handle_t* message) const
+void AppSide::handle_simcall_execute(const s_mc_message_simcall_execute_t* message) const
{
kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(message->aid_);
xbt_assert(actor != nullptr, "Invalid pid %ld", message->aid_);
- if (actor->simcall_.observer_ != nullptr)
- actor->observer_stack_.push_back(actor->simcall_.observer_->clone());
+ simgrid::kernel::actor::SimcallObserver* observer = nullptr;
+ if (actor->simcall_.observer_ != nullptr) {
+ observer = actor->simcall_.observer_->clone();
+ actor->observer_stack_.push_back(observer);
+ }
+ // Finish the RPC from the server: we need to return a pointer to the observer, saved in a stable storage
+ s_mc_message_simcall_execute_answer_t answer{MessageType::SIMCALL_EXECUTE_ANSWER, observer};
+ XBT_DEBUG("send SIMCALL_EXECUTE_ANSWER(%p)", observer);
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
+
+ // The client may send some messages to the server while processing the transition
actor->simcall_handle(message->times_considered_);
+
+ // Say the server that the transition is over and that it should proceed
xbt_assert(channel_.send(MessageType::WAITING) == 0, "Could not send MESSAGE_WAITING to model-checker");
}
{
bool res = mc::actor_is_enabled(kernel::actor::ActorImpl::by_pid(msg->aid));
s_mc_message_int_t answer{MessageType::ACTOR_ENABLED_REPLY, res};
+ XBT_DEBUG("Actor %ld %s enabled", msg->aid, (res ? "IS" : "is NOT"));
xbt_assert(channel_.send(answer) == 0, "Could not send ACTOR_ENABLED_REPLY");
}
assert_msg_size("MESSAGE_CONTINUE", s_mc_message_t);
return;
- case MessageType::SIMCALL_HANDLE:
- assert_msg_size("SIMCALL_HANDLE", s_mc_message_simcall_handle_t);
- handle_simcall_execute((s_mc_message_simcall_handle_t*)message_buffer.data());
+ case MessageType::SIMCALL_EXECUTE:
+ assert_msg_size("SIMCALL_EXECUTE", s_mc_message_simcall_execute_t);
+ handle_simcall_execute((s_mc_message_simcall_execute_t*)message_buffer.data());
break;
case MessageType::SIMCALL_IS_VISIBLE: {
const kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(msg_simcall->aid);
xbt_assert(actor != nullptr, "Invalid pid %ld", msg_simcall->aid);
xbt_assert(actor->simcall_.observer_, "The transition of %s has no observer", actor->get_cname());
- std::string value = actor->simcall_.observer_->to_string(msg_simcall->time_considered);
+ std::string value = "";
+ if (actor->simcall_.observer_ != nullptr)
+ value = actor->simcall_.observer_->to_string(msg_simcall->time_considered);
+ else
+ value = "[(" + std::to_string(actor->get_pid()) + ")" + actor->get_host()->get_cname() + " (" +
+ actor->get_cname() + ")] " + SIMIX_simcall_name(actor->simcall_) + "(unknown?)";
// Send result:
s_mc_message_simcall_to_string_answer_t answer{MessageType::SIMCALL_TO_STRING_ANSWER, {0}};
case MessageType::SIMCALL_DOT_LABEL: {
assert_msg_size("SIMCALL_DOT_LABEL", s_mc_message_simcall_to_string_t);
- auto msg_simcall = (s_mc_message_simcall_to_string_t*)message_buffer.data();
+ auto msg_simcall = (s_mc_message_simcall_to_string_t*)message_buffer.data();
const kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(msg_simcall->aid);
xbt_assert(actor != nullptr, "Invalid pid %ld", msg_simcall->aid);
- xbt_assert(actor->simcall_.observer_, "The transition of %s has no observer", actor->get_cname());
- std::string value = actor->simcall_.observer_->dot_label(msg_simcall->time_considered);
+ std::string value = "";
+ if (actor->simcall_.observer_ != nullptr)
+ value = actor->simcall_.observer_->dot_label(msg_simcall->time_considered);
+ else
+ value = "UNIMPLEMENTED";
// Send result:
s_mc_message_simcall_to_string_answer_t answer{MessageType::SIMCALL_TO_STRING_ANSWER, {0}};
break;
}
+ case MessageType::SIMCALLS_DEPENDENT: {
+ assert_msg_size("SIMCALLS_DEPENDENT", s_mc_message_simcalls_dependent_t);
+ auto msg_simcalls = (s_mc_message_simcalls_dependent_t*)message_buffer.data();
+ auto* obs1 = msg_simcalls->obs1;
+ auto* obs2 = msg_simcalls->obs2;
+ bool res = true;
+
+ if (obs1 != nullptr && obs2 != nullptr)
+ res = obs1->depends(obs2);
+
+ XBT_DEBUG("return SIMCALLS_DEPENDENT(%s, %s) = %s", obs1->to_string(0).c_str(), obs2->to_string(0).c_str(),
+ (res ? "true" : "false"));
+
+ // Send result:
+ s_mc_message_simcalls_dependent_answer_t answer{MessageType::SIMCALLS_DEPENDENT_ANSWER, 0};
+ answer.value = res;
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
+ break;
+ }
+
case MessageType::ACTOR_ENABLED:
assert_msg_size("ACTOR_ENABLED", s_mc_message_actor_enabled_t);
handle_actor_enabled((s_mc_message_actor_enabled_t*)message_buffer.data());
void AppSide::declare_symbol(const char* name, int* value) const
{
s_mc_message_register_symbol_t message;
+ memset(&message, 0, sizeof(message));
message.type = MessageType::REGISTER_SYMBOL;
xbt_assert(strlen(name) + 1 <= message.name.size(), "Symbol is too long");
strncpy(message.name.data(), name, message.name.size());
