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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
429a995
..
063e695
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-1,17
+1,21
@@
-/* Copyright (c) 2008-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-201
8
. 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. */
-#include <simgrid_config.h>
-
-#include "mc/mc.h"
#include "src/mc/mc_base.h"
#include "src/mc/mc_base.h"
-#include "src/mc/mc_replay.h"
+#include "mc/mc.h"
+#include "simgrid/config.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
#include "src/simix/smx_private.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
using simgrid::mc::remote;
#endif
using simgrid::mc::remote;
#endif
@@
-68,7
+72,7
@@
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->pid);
+ return mc_model_checker->process().actor_is_enabled(actor->pid
_
);
}
#endif
}
#endif
@@
-111,7
+115,7
@@
bool actor_is_enabled(smx_actor_t actor)
if (mutex->owner == nullptr)
return true;
if (mutex->owner == nullptr)
return true;
- return mutex->owner->pid
== req->issuer->pid
;
+ return mutex->owner->pid
_ == req->issuer->pid_
;
}
case SIMCALL_SEM_ACQUIRE: {
}
case SIMCALL_SEM_ACQUIRE: {
@@
-175,7
+179,7
@@
static int prng_random(int min, int max)
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
- if (not MC_is_active() &&
not MC_record_path
)
+ if (not MC_is_active() &&
MC_record_path.empty()
)
return prng_random(min, max);
return simcall->mc_value;
}
return prng_random(min, max);
return simcall->mc_value;
}