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 git+ssh://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
3e02230
..
384283f
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-1,4
+1,4
@@
-/* 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. */
@@
-7,8
+7,11
@@
#include "mc/mc.h"
#include "src/mc/mc_base.h"
#include "mc/mc.h"
#include "src/mc/mc_base.h"
-#include "src/mc/mc_replay.h"
-#include "src/simix/smx_private.h"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_private.hpp"
+
+#include "src/kernel/activity/MutexImpl.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
@@
-97,14
+100,9
@@
bool actor_is_enabled(smx_actor_t actor)
}
case SIMCALL_COMM_WAITANY: {
}
case SIMCALL_COMM_WAITANY: {
- xbt_dynar_t comms;
- simgrid::kernel::activity::CommImpl* act =
- static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
-
- comms = simcall_comm_waitany__get__comms(req);
-
+ xbt_dynar_t comms = simcall_comm_waitany__get__comms(req);
for (unsigned int index = 0; index < comms->used; ++index) {
for (unsigned int index = 0; index < comms->used; ++index) {
- act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
+
simgrid::kernel::activity::CommImpl*
act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
if (act->src_proc && act->dst_proc)
return true;
}
if (act->src_proc && act->dst_proc)
return true;
}
@@
-116,8
+114,7
@@
bool actor_is_enabled(smx_actor_t actor)
if (mutex->owner == nullptr)
return true;
if (mutex->owner == nullptr)
return true;
- else
- return mutex->owner->pid == req->issuer->pid;
+ return mutex->owner->pid == req->issuer->pid;
}
case SIMCALL_SEM_ACQUIRE: {
}
case SIMCALL_SEM_ACQUIRE: {
@@
-181,7
+178,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;
}