-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2017. 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 <cassert>
-
#include <simgrid_config.h>
-#include <xbt/log.h>
-#include <xbt/asserts.h>
-#include <xbt/dynar.h>
-
-#include <simgrid/simix.h>
-
+#include "mc/mc.h"
#include "src/mc/mc_base.h"
-#include "src/simix/smx_private.h"
#include "src/mc/mc_replay.h"
-#include "mc/mc.h"
-#include "src/mc/mc_protocol.h"
-
-#include "src/simix/Synchro.h"
-#include "src/simix/SynchroComm.hpp"
+#include "src/simix/smx_private.h"
-#if HAVE_MC
-#include "src/mc/mc_request.h"
-#include "src/mc/Process.hpp"
+#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/mc_smx.h"
-#endif
-#if HAVE_MC
using simgrid::mc::remote;
#endif
-XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
+XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories");
int MC_random(int min, int max)
{
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr);
- /* TODO, if the MC is disabled we do not really need to make a simcall for
- * this :) */
#endif
+ /* TODO, if the MC is disabled we do not really need to make a simcall for this :) */
return simcall_mc_random(min, max);
}
void wait_for_requests(void)
{
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr);
#endif
- smx_process_t process;
+ smx_actor_t process;
smx_simcall_t req;
unsigned int iter;
SIMIX_simcall_handle(req, 0);
}
}
+#if SIMGRID_HAVE_MC
+ xbt_dynar_reset(simix_global->actors_vector);
+ for (std::pair<aid_t, smx_actor_t> kv : simix_global->process_list) {
+ xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
+ }
+#endif
}
+/** @brief returns if there this transition can proceed in a finite amount of time
+ *
+ * It is used in the model-checker to not get into self-deadlock where it would execute a never ending transition.
+ *
+ * Only WAIT operations (on comm, on mutex, etc) can ever return false because they could lock the MC exploration.
+ * Wait operations are OK and return true in only two situations:
+ * - if the wait will succeed immediately (if both peer of the comm are there already or if the mutex is available)
+ * - if a timeout is provided, because we can fire the timeout if the transition is not ready without blocking in this transition for ever.
+ *
+ */
// Called from both MCer and MCed:
bool request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
-#if HAVE_MC
- simgrid::simix::Synchro temp_synchro;
-#endif
+ // TODO, add support for the subtypes?
switch (req->call) {
case SIMCALL_NONE:
case SIMCALL_COMM_WAIT:
{
/* FIXME: check also that src and dst processes are not suspended */
- simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::Comm *act =
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
// Fetch from MCed memory:
+ // HACK, type puning
if (mc_model_checker != nullptr) {
- mc_model_checker->process().read(&temp_synchro, remote(act));
- act = &temp_synchro;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
+ mc_model_checker->process().read(temp_comm, remote(act));
+ act = static_cast<simgrid::kernel::activity::Comm*>(temp_comm.getBuffer());
}
#endif
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
- simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
-#if HAVE_MC
+ simgrid::kernel::activity::Comm *act =
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
+#if SIMGRID_HAVE_MC
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
if (mc_model_checker != nullptr) {
#endif
for (index = 0; index < comms->used; ++index) {
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
// Fetch act from MCed memory:
+ // HACK, type puning
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
if (mc_model_checker != nullptr) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
- mc_model_checker->process().read(&temp_synchro, remote(act));
- act = &temp_synchro;
+ mc_model_checker->process().read(temp_comm, remote(act));
+ act = static_cast<simgrid::kernel::activity::Comm*>(temp_comm.getBuffer());
}
else
#endif
- act = xbt_dynar_get_as(comms, index, simgrid::simix::Comm*);
+ act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::Comm*);
if (act->src_proc && act->dst_proc)
return true;
}
return false;
}
- case SIMCALL_MUTEX_TRYLOCK:
- return true;
-
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
-#if HAVE_MC
- s_smx_mutex_t temp_mutex;
+#if SIMGRID_HAVE_MC
+ simgrid::mc::Remote<simgrid::simix::Mutex> temp_mutex;
if (mc_model_checker != nullptr) {
- mc_model_checker->process().read(&temp_mutex, remote(mutex));
- mutex = &temp_mutex;
+ mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex));
+ mutex = temp_mutex.getBuffer();
}
#endif
if(mutex->owner == nullptr)
return true;
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
else if (mc_model_checker != nullptr) {
simgrid::mc::Process& modelchecked = mc_model_checker->process();
// TODO, *(mutex->owner) :/
- return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid
- == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid;
+ return modelchecked.resolveActor(simgrid::mc::remote(mutex->owner))->pid ==
+ modelchecked.resolveActor(simgrid::mc::remote(req->issuer))->pid;
}
#endif
else
return mutex->owner->pid == req->issuer->pid;
}
- default:
- /* The rest of the requests are always enabled */
- return true;
+ case SIMCALL_SEM_ACQUIRE: {
+ static int warned = 0;
+ if (!warned)
+ XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
+ warned = 1;
+ return true;
+ }
+
+ case SIMCALL_COND_WAIT: {
+ static int warned = 0;
+ if (!warned)
+ XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
+ warned = 1;
+ return true;
+ }
+
+ default:
+ /* The rest of the requests are always enabled */
+ return true;
}
}
