A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix host name issue with ns3 wifi, add ssid, set active probing to false
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index 10c8ec915dd6faae257646f931eded5aaff72aeb..2a595673862f719a03fe360f190bc902a2f5e991 100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-20
20
. 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. */
/* 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. */
@@
-11,11
+11,12
@@
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
-#include
<random>
+#include
"xbt/random.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/Session.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
using simgrid::mc::remote;
#endif
using simgrid::mc::remote;
#endif
@@
-42,14
+43,14
@@
void wait_for_requests()
while (not simix_global->actors_to_run.empty()) {
simix_global->run_all_actors();
for (smx_actor_t const& process : simix_global->actors_that_ran) {
while (not simix_global->actors_to_run.empty()) {
simix_global->run_all_actors();
for (smx_actor_t const& process : simix_global->actors_that_ran) {
-
smx_simcall_t req = &process->simcall
;
+
const s_smx_simcall* req = &process->simcall_
;
if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
process->simcall_handle(0);
}
}
#if SIMGRID_HAVE_MC
xbt_dynar_reset(simix_global->actors_vector);
if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
process->simcall_handle(0);
}
}
#if SIMGRID_HAVE_MC
xbt_dynar_reset(simix_global->actors_vector);
- for (std::pair<aid_t, smx_actor_t> const& kv : simix_global->process_list) {
+ for (std::pair<
const
aid_t, smx_actor_t> const& kv : simix_global->process_list) {
xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
}
#endif
xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
}
#endif
@@
-72,12
+73,12
@@
bool actor_is_enabled(smx_actor_t actor)
#if SIMGRID_HAVE_MC
// If in the MCer, ask the client app since it has all the data
if (mc_model_checker != nullptr) {
#if SIMGRID_HAVE_MC
// If in the MCer, ask the client app since it has all the data
if (mc_model_checker != nullptr) {
- return
mc_model_checker->process().
actor_is_enabled(actor->get_pid());
+ return
simgrid::mc::session->
actor_is_enabled(actor->get_pid());
}
#endif
// Now, we are in the client app, no need for remote memory reading.
}
#endif
// Now, we are in the client app, no need for remote memory reading.
- smx_simcall_t req = &actor->simcall;
+ smx_simcall_t req = &actor->simcall
_
;
if (req->inspector_ != nullptr)
return req->inspector_->is_enabled();
if (req->inspector_ != nullptr)
return req->inspector_->is_enabled();
@@
-88,8
+89,7
@@
bool actor_is_enabled(smx_actor_t actor)
case SIMCALL_COMM_WAIT: {
/* FIXME: check also that src and dst processes are not suspended */
case SIMCALL_COMM_WAIT: {
/* FIXME: check also that src and dst processes are not suspended */
- const kernel::activity::CommImpl* act =
- static_cast<kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
+ const kernel::activity::CommImpl* act = simcall_comm_wait__getraw__comm(req);
if (act->src_timeout_ || act->dst_timeout_) {
/* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
if (act->src_timeout_ || act->dst_timeout_) {
/* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
@@
-118,9
+118,9
@@
bool actor_is_enabled(smx_actor_t actor)
case SIMCALL_MUTEX_LOCK: {
const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
case SIMCALL_MUTEX_LOCK: {
const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
- if (mutex->
owner_
== nullptr)
+ if (mutex->
get_owner()
== nullptr)
return true;
return true;
- return mutex->
owner_
->get_pid() == req->issuer_->get_pid();
+ return mutex->
get_owner()
->get_pid() == req->issuer_->get_pid();
}
case SIMCALL_SEM_ACQUIRE: {
}
case SIMCALL_SEM_ACQUIRE: {
@@
-148,7
+148,7
@@
bool actor_is_enabled(smx_actor_t actor)
/* This is the list of requests that are visible from the checker algorithm.
* Any other requests are handled right away on the application side.
*/
/* This is the list of requests that are visible from the checker algorithm.
* Any other requests are handled right away on the application side.
*/
-bool request_is_visible(
smx_simcall_t
req)
+bool request_is_visible(
const s_smx_simcall*
req)
{
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
{
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
@@
-166,9
+166,8
@@
bool request_is_visible(smx_simcall_t req)
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
if (not MC_is_active() && MC_record_path.empty()) {
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
if (not MC_is_active() && MC_record_path.empty()) {
- static std::default_random_engine rnd_engine;
- std::uniform_int_distribution<int> prng(min, max);
- return prng(rnd_engine);
+ static simgrid::xbt::random::XbtRandom prng;
+ return prng.uniform_int(min, max);
}
return simcall->mc_value_;
}
}
return simcall->mc_value_;
}