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
[mc] Use std::vector for State::incomplete_comm_pattern (dexbtification)
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
5b61d7b
..
f68fc96
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-20,18
+20,17
@@
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
-#ifdef HAVE_MC
+#if HAVE_MC
+#include "src/mc/mc_request.h"
#include "src/mc/Process.hpp"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/mc_smx.h"
#endif
#include "src/mc/Process.hpp"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/mc_smx.h"
#endif
-#if
def
HAVE_MC
+#if HAVE_MC
using simgrid::mc::remote;
#endif
using simgrid::mc::remote;
#endif
-extern "C" {
-
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
int MC_random(int min, int max)
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
int MC_random(int min, int max)
@@
-43,7
+42,10
@@
int MC_random(int min, int max)
return simcall_mc_random(min, max);
}
return simcall_mc_random(min, max);
}
-void MC_wait_for_requests(void)
+namespace simgrid {
+namespace mc {
+
+void wait_for_requests(void)
{
assert(mc_mode != MC_MODE_SERVER);
{
assert(mc_mode != MC_MODE_SERVER);
@@
-55,30
+57,30
@@
void MC_wait_for_requests(void)
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
- if (req->call != SIMCALL_NONE && !
MC_
request_is_visible(req))
+ if (req->call != SIMCALL_NONE && !
simgrid::mc::
request_is_visible(req))
SIMIX_simcall_handle(req, 0);
}
}
}
// Called from both MCer and MCed:
SIMIX_simcall_handle(req, 0);
}
}
}
// Called from both MCer and MCed:
-
int MC_
request_is_enabled(smx_simcall_t req)
+
bool
request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
smx_synchro_t act = 0;
{
unsigned int index = 0;
smx_synchro_t act = 0;
-#if
def
HAVE_MC
+#if HAVE_MC
s_smx_synchro_t temp_synchro;
#endif
switch (req->call) {
case SIMCALL_NONE:
s_smx_synchro_t temp_synchro;
#endif
switch (req->call) {
case SIMCALL_NONE:
- return
FALSE
;
+ return
false
;
case SIMCALL_COMM_WAIT:
/* FIXME: check also that src and dst processes are not suspended */
act = simcall_comm_wait__get__comm(req);
case SIMCALL_COMM_WAIT:
/* FIXME: check also that src and dst processes are not suspended */
act = simcall_comm_wait__get__comm(req);
-#if
def
HAVE_MC
+#if HAVE_MC
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_synchro, remote(act));
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_synchro, remote(act));
@@
-90,18
+92,17
@@
int MC_request_is_enabled(smx_simcall_t req)
/* If it has a timeout it will be always be enabled, because even if the
* communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
/* If it has a timeout it will be always be enabled, because even if the
* communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
- return
TRUE
;
- }
else {
-
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
-
if (act->comm.detached && act->comm.src_proc == nullptr
+ return
true
;
+ }
+ /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
+
else
if (act->comm.detached && act->comm.src_proc == nullptr
&& act->comm.type == SIMIX_COMM_READY)
return (act->comm.dst_proc != nullptr);
&& act->comm.type == SIMIX_COMM_READY)
return (act->comm.dst_proc != nullptr);
- }
return (act->comm.src_proc && act->comm.dst_proc);
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
return (act->comm.src_proc && act->comm.dst_proc);
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
-#if
def
HAVE_MC
+#if HAVE_MC
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
@@
-112,9
+113,9
@@
int MC_request_is_enabled(smx_simcall_t req)
assert(comms_buffer.elmsize == sizeof(act));
buffer_size = comms_buffer.elmsize * comms_buffer.used;
comms = &comms_buffer;
assert(comms_buffer.elmsize == sizeof(act));
buffer_size = comms_buffer.elmsize * comms_buffer.used;
comms = &comms_buffer;
- } else
{
+ } else
comms = simcall_comm_waitany__get__comms(req);
comms = simcall_comm_waitany__get__comms(req);
- }
+
// Read all the dynar buffer:
char buffer[buffer_size];
if (mc_mode == MC_MODE_SERVER)
// Read all the dynar buffer:
char buffer[buffer_size];
if (mc_mode == MC_MODE_SERVER)
@@
-125,7
+126,7
@@
int MC_request_is_enabled(smx_simcall_t req)
#endif
for (index = 0; index < comms->used; ++index) {
#endif
for (index = 0; index < comms->used; ++index) {
-#if
def
HAVE_MC
+#if HAVE_MC
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
@@
-136,17
+137,17
@@
int MC_request_is_enabled(smx_simcall_t req)
#endif
act = xbt_dynar_get_as(comms, index, smx_synchro_t);
if (act->comm.src_proc && act->comm.dst_proc)
#endif
act = xbt_dynar_get_as(comms, index, smx_synchro_t);
if (act->comm.src_proc && act->comm.dst_proc)
- return
TRUE
;
+ return
true
;
}
}
- return
FALSE
;
+ return
false
;
}
case SIMCALL_MUTEX_TRYLOCK:
}
case SIMCALL_MUTEX_TRYLOCK:
- return
TRUE
;
+ return
true
;
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
-#if
def
HAVE_MC
+#if HAVE_MC
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_mutex, remote(mutex));
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
mc_model_checker->process().read(&temp_mutex, remote(mutex));
@@
-154,9
+155,9
@@
int MC_request_is_enabled(smx_simcall_t req)
}
#endif
if(mutex->owner == nullptr)
}
#endif
if(mutex->owner == nullptr)
- return
TRUE
;
+ return
true
;
else
else
-#if
def
HAVE_MC
+#if HAVE_MC
// TODO, *(mutex->owner) :/
return MC_smx_resolve_process(mutex->owner)->pid ==
MC_smx_resolve_process(req->issuer)->pid;
// TODO, *(mutex->owner) :/
return MC_smx_resolve_process(mutex->owner)->pid ==
MC_smx_resolve_process(req->issuer)->pid;
@@
-167,11
+168,11
@@
int MC_request_is_enabled(smx_simcall_t req)
default:
/* The rest of the requests are always enabled */
default:
/* The rest of the requests are always enabled */
- return
TRUE
;
+ return
true
;
}
}
}
}
-
int MC_
request_is_visible(smx_simcall_t req)
+
bool
request_is_visible(smx_simcall_t req)
{
return req->call == SIMCALL_COMM_ISEND
|| req->call == SIMCALL_COMM_IRECV
{
return req->call == SIMCALL_COMM_ISEND
|| req->call == SIMCALL_COMM_IRECV
@@
-182,13
+183,12
@@
int MC_request_is_visible(smx_simcall_t req)
|| req->call == SIMCALL_MC_RANDOM
|| req->call == SIMCALL_MUTEX_LOCK
|| req->call == SIMCALL_MUTEX_TRYLOCK
|| req->call == SIMCALL_MC_RANDOM
|| req->call == SIMCALL_MUTEX_LOCK
|| req->call == SIMCALL_MUTEX_TRYLOCK
-#ifdef HAVE_MC
- || req->call == SIMCALL_MC_SNAPSHOT
- || req->call == SIMCALL_MC_COMPARE_SNAPSHOTS
-#endif
;
}
;
}
+}
+}
+
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
@@
-199,7
+199,7
@@
static int prng_random(int min, int max)
// Use rejection in order to avoid skew
unsigned long x;
do {
// Use rejection in order to avoid skew
unsigned long x;
do {
-#ifndef _
XBT_
WIN32
+#ifndef _WIN32
x = (unsigned long) random();
#else
x = (unsigned long) rand();
x = (unsigned long) random();
#else
x = (unsigned long) rand();
@@
-210,16
+210,17
@@
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 (!MC_is_active() && !MC_record_path)
{
+ if (!MC_is_active() && !MC_record_path)
return prng_random(min, max);
return prng_random(min, max);
- }
-
return simcall->mc_value;
}
return simcall->mc_value;
}
-void MC_simcall_handle(smx_simcall_t req, int value)
+namespace simgrid {
+namespace mc {
+
+void handle_simcall(smx_simcall_t req, int value)
{
{
-#if
ndef
HAVE_MC
+#if
!
HAVE_MC
SIMIX_simcall_handle(req, value);
#else
if (mc_mode == MC_MODE_CLIENT) {
SIMIX_simcall_handle(req, value);
#else
if (mc_mode == MC_MODE_CLIENT) {
@@
-227,19
+228,16
@@
void MC_simcall_handle(smx_simcall_t req, int value)
return;
}
return;
}
- unsigned i;
- mc_smx_process_info_t pi = nullptr;
-
- xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
- if (req == &pi->copy.simcall) {
+ for (auto& pi : mc_model_checker->process().smx_process_infos)
+ if (req == &pi.copy.simcall) {
mc_model_checker->simcall_handle(
mc_model_checker->simcall_handle(
- mc_model_checker->process(), pi
->
copy.pid, value);
+ mc_model_checker->process(), pi
.
copy.pid, value);
return;
}
return;
}
- }
xbt_die("Could not find the request");
#endif
}
}
xbt_die("Could not find the request");
#endif
}
}
+}