#include "src/mc/remote/AppSide.hpp"
#include "src/internal_config.h"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/mc/mc_base.hpp"
#include "src/mc/remote/RemoteProcess.hpp"
+#if HAVE_SMPI
+#include "src/smpi/include/private.hpp"
+#endif
#include "xbt/coverage.h"
+#include "xbt/str.h"
#include "xbt/xbt_modinter.h" /* mmalloc_preinit to get the default mmalloc arena address */
#include <simgrid/modelchecker.h>
#include <cerrno>
+#include <cstdio> // setvbuf
#include <cstdlib>
#include <cstring>
#include <memory>
_sg_do_model_check = 1;
+ setvbuf(stdout, nullptr, _IOLBF, 0);
+
// Fetch socket from MC_ENV_SOCKET_FD:
const char* fd_env = std::getenv(MC_ENV_SOCKET_FD);
- int fd = xbt_str_parse_int(fd_env, "Variable '" MC_ENV_SOCKET_FD "' should contain a number but contains '%s'");
+ int fd = xbt_str_parse_int(fd_env, "Not a number in variable '" MC_ENV_SOCKET_FD "'");
XBT_DEBUG("Model-checked application found socket FD %i", fd);
// Check the socket type/validity:
xbt_assert(errno == 0 && raise(SIGSTOP) == 0, "Could not wait for the model-checker (errno = %d: %s)", errno,
strerror(errno));
- s_mc_message_initial_addresses_t message{
- MessageType::INITIAL_ADDRESSES, mmalloc_preinit(), simgrid::kernel::actor::get_maxpid_addr(),
- simgrid::simix::simix_global_get_actors_addr(), simgrid::simix::simix_global_get_dead_actors_addr()};
- int send_res = instance_->channel_.send(message);
- xbt_assert(send_res == 0, "Could not send the initial message with addresses.");
+ s_mc_message_initial_addresses_t message{MessageType::INITIAL_ADDRESSES, mmalloc_preinit(),
+ kernel::actor::get_maxpid_addr(), simix::simix_global_get_actors_addr(),
+ simix::simix_global_get_dead_actors_addr()};
+ xbt_assert(instance_->channel_.send(message) == 0, "Could not send the initial message with addresses.");
instance_->handle_messages();
return instance_.get();
void AppSide::handle_deadlock_check(const s_mc_message_t*) const
{
- bool deadlock = false;
- if (not simix_global->process_list.empty()) {
- deadlock = true;
- for (auto const& kv : simix_global->process_list)
- if (simgrid::mc::actor_is_enabled(kv.second)) {
- deadlock = false;
- break;
- }
- }
+ const auto& actor_list = kernel::EngineImpl::get_instance()->get_actor_list();
+ bool deadlock = not actor_list.empty() && std::none_of(begin(actor_list), end(actor_list), [](const auto& kv) {
+ return mc::actor_is_enabled(kv.second);
+ });
// Send result:
s_mc_message_int_t answer{MessageType::DEADLOCK_CHECK_REPLY, deadlock};
- int send_res = channel_.send(answer);
- xbt_assert(send_res == 0, "Could not send response");
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
}
void AppSide::handle_simcall_execute(const s_mc_message_simcall_handle_t* message) const
{
- kernel::actor::ActorImpl* process = kernel::actor::ActorImpl::by_pid(message->aid_);
- xbt_assert(process != nullptr, "Invalid pid %lu", message->aid_);
- process->simcall_handle(message->times_considered_);
+ 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());
+ actor->simcall_handle(message->times_considered_);
xbt_assert(channel_.send(MessageType::WAITING) == 0, "Could not send MESSAGE_WAITING to model-checker");
}
void AppSide::handle_actor_enabled(const s_mc_message_actor_enabled_t* msg) const
{
- bool res = simgrid::mc::actor_is_enabled(kernel::actor::ActorImpl::by_pid(msg->aid));
+ bool res = mc::actor_is_enabled(kernel::actor::ActorImpl::by_pid(msg->aid));
s_mc_message_int_t answer{MessageType::ACTOR_ENABLED_REPLY, res};
- channel_.send(answer);
+ xbt_assert(channel_.send(answer) == 0, "Could not send ACTOR_ENABLED_REPLY");
}
#define assert_msg_size(_name_, _type_) \
assert_msg_size("SIMCALL_IS_VISIBLE", s_mc_message_simcall_is_visible_t);
auto msg_simcall = (s_mc_message_simcall_is_visible_t*)message_buffer.data();
const kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(msg_simcall->aid);
- xbt_assert(actor != nullptr, "Invalid pid %d", 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());
bool value = actor->simcall_.observer_->is_visible();
// Send result:
s_mc_message_simcall_is_visible_answer_t answer{MessageType::SIMCALL_IS_VISIBLE_ANSWER, value};
- int send_res = channel_.send(answer);
- xbt_assert(send_res == 0, "Could not send response");
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
break;
}
assert_msg_size("SIMCALL_TO_STRING", s_mc_message_simcall_to_string_t);
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 %d", 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);
// Send result:
s_mc_message_simcall_to_string_answer_t answer{MessageType::SIMCALL_TO_STRING_ANSWER, {0}};
value.copy(answer.value, (sizeof answer.value) - 1); // last byte was set to '\0' by initialization above
- int send_res = channel_.send(answer);
- xbt_assert(send_res == 0, "Could not send response");
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
break;
}
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();
const kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(msg_simcall->aid);
- xbt_assert(actor != nullptr, "Invalid pid %d", 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();
// Send result:
s_mc_message_simcall_to_string_answer_t answer{MessageType::SIMCALL_TO_STRING_ANSWER, {0}};
value.copy(answer.value, (sizeof answer.value) - 1); // last byte was set to '\0' by initialization above
- int send_res = channel_.send(answer);
- xbt_assert(send_res == 0, "Could not send response");
+ xbt_assert(channel_.send(answer) == 0, "Could not send response");
break;
}
XBT_DEBUG("Finalize (terminate = %d)", (int)terminate_asap);
if (not terminate_asap) {
if (XBT_LOG_ISENABLED(mc_client, xbt_log_priority_debug))
- simix_global->display_all_actor_status();
+ kernel::EngineImpl::get_instance()->display_all_actor_status();
#if HAVE_SMPI
XBT_DEBUG("Smpi_enabled: %d", (int)smpi_enabled());
if (smpi_enabled())
#endif
}
coverage_checkpoint();
- int send_res = channel_.send(MessageType::DEADLOCK_CHECK_REPLY); // really?
- xbt_assert(send_res == 0, "Could not answer to FINALIZE");
+ xbt_assert(channel_.send(MessageType::DEADLOCK_CHECK_REPLY) == 0, // DEADLOCK_CHECK_REPLY, really?
+ "Could not answer to FINALIZE");
+ std::fflush(stdout);
if (terminate_asap)
::_Exit(0);
break;
coverage_checkpoint();
while (true) {
simgrid::mc::execute_actors();
- int send_res = channel_.send(MessageType::WAITING);
- xbt_assert(send_res == 0, "Could not send WAITING message to model-checker");
+ xbt_assert(channel_.send(MessageType::WAITING) == 0, "Could not send WAITING message to model-checker");
this->handle_messages();
}
}
message.fragment = -1;
heap->heapinfo[message.block].busy_block.ignore++;
} else {
- message.fragment = (ADDR2UINT(address) % BLOCKSIZE) >> heap->heapinfo[message.block].type;
+ message.fragment = address ? (ADDR2UINT(address) % BLOCKSIZE) >> heap->heapinfo[message.block].type : 0;
heap->heapinfo[message.block].busy_frag.ignore[message.fragment]++;
}
