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
Avoid multiple declaration on the same line/statement
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
5b7ce3b
..
708f3c5
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-6,6
+6,8
@@
#include <cassert>
#include <cassert>
+#include <algorithm>
+
#include <simgrid_config.h>
#include <xbt/log.h>
#include <simgrid_config.h>
#include <xbt/log.h>
@@
-20,6
+22,13
@@
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
+#include "src/simix/Synchro.h"
+#include "src/simix/SynchroIo.hpp"
+#include "src/simix/SynchroComm.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroExec.hpp"
+
#if HAVE_MC
#include "src/mc/mc_request.h"
#include "src/mc/Process.hpp"
#if HAVE_MC
#include "src/mc/mc_request.h"
#include "src/mc/Process.hpp"
@@
-35,9
+44,11
@@
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
int MC_random(int min, int max)
{
int MC_random(int min, int max)
{
- xbt_assert(mc_mode != MC_MODE_SERVER);
+#if 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 :) */
/* TODO, if the MC is disabled we do not really need to make a simcall for
* this :) */
+#endif
return simcall_mc_random(min, max);
}
return simcall_mc_random(min, max);
}
@@
-46,7
+57,9
@@
namespace mc {
void wait_for_requests(void)
{
void wait_for_requests(void)
{
- assert(mc_mode != MC_MODE_SERVER);
+#if HAVE_MC
+ xbt_assert(mc_model_checker == nullptr);
+#endif
smx_process_t process;
smx_simcall_t req;
smx_process_t process;
smx_simcall_t req;
@@
-66,24
+79,24
@@
void wait_for_requests(void)
bool request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
bool request_is_enabled(smx_simcall_t req)
{
unsigned int index = 0;
- smx_synchro_t act = 0;
-#if HAVE_MC
- s_smx_synchro_t temp_synchro;
-#endif
+ // TODO, add support for the subtypes?
switch (req->call) {
case SIMCALL_NONE:
return false;
case SIMCALL_COMM_WAIT:
switch (req->call) {
case SIMCALL_NONE:
return false;
case SIMCALL_COMM_WAIT:
+ {
/* FIXME: check also that src and dst processes are not suspended */
/* FIXME: check also that src and dst processes are not suspended */
-
act = simcall_comm_wait__get__comm(req
);
+
simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req)
);
#if HAVE_MC
// Fetch from MCed memory:
#if HAVE_MC
// Fetch from MCed memory:
- if (mc_mode == MC_MODE_SERVER) {
- mc_model_checker->process().read(&temp_synchro, remote(act));
- act = &temp_synchro;
+ // HACK, type puning
+ simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ if (mc_model_checker != nullptr) {
+ mc_model_checker->process().read(temp_comm, remote(act));
+ act = static_cast<simgrid::simix::Comm*>(temp_comm.getBuffer());
}
#endif
}
#endif
@@
-94,18
+107,20
@@
bool request_is_enabled(smx_simcall_t req)
return true;
}
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
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);
- return (act->comm.src_proc && act->comm.dst_proc);
+ else if (act->detached && act->src_proc == nullptr
+ && act->type == SIMIX_COMM_READY)
+ return (act->dst_proc != nullptr);
+ return (act->src_proc && act->dst_proc);
+ }
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
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
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
#if HAVE_MC
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
- if (mc_mode
== MC_MODE_SERVER
) {
+ if (mc_mode
l_checker != nullptr
) {
// Read dynar:
mc_model_checker->process().read(
&comms_buffer, remote(simcall_comm_waitany__get__comms(req)));
// Read dynar:
mc_model_checker->process().read(
&comms_buffer, remote(simcall_comm_waitany__get__comms(req)));
@@
-117,7
+132,7
@@
bool request_is_enabled(smx_simcall_t req)
// Read all the dynar buffer:
char buffer[buffer_size];
// Read all the dynar buffer:
char buffer[buffer_size];
- if (mc_mode
== MC_MODE_SERVER
)
+ if (mc_mode
l_checker != nullptr
)
mc_model_checker->process().read_bytes(buffer, sizeof(buffer),
remote(comms->data));
#else
mc_model_checker->process().read_bytes(buffer, sizeof(buffer),
remote(comms->data));
#else
@@
-127,15
+142,17
@@
bool request_is_enabled(smx_simcall_t req)
for (index = 0; index < comms->used; ++index) {
#if HAVE_MC
// Fetch act from MCed memory:
for (index = 0; index < comms->used; ++index) {
#if HAVE_MC
// Fetch act from MCed memory:
- if (mc_mode == MC_MODE_SERVER) {
+ // HACK, type puning
+ simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ if (mc_model_checker != nullptr) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
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::simix::Comm*>(temp_comm.getBuffer())
;
}
else
#endif
}
else
#endif
- act = xbt_dynar_get_as(comms, index, s
mx_synchro_t
);
- if (act->
comm.src_proc && act->comm.
dst_proc)
+ act = xbt_dynar_get_as(comms, index, s
imgrid::simix::Comm*
);
+ if (act->
src_proc && act->
dst_proc)
return true;
}
return false;
return true;
}
return false;
@@
-148,21
+165,24
@@
bool request_is_enabled(smx_simcall_t req)
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#if HAVE_MC
s_smx_mutex_t temp_mutex;
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#if HAVE_MC
s_smx_mutex_t temp_mutex;
- if (mc_mode
== MC_MODE_SERVER
) {
+ if (mc_mode
l_checker != nullptr
) {
mc_model_checker->process().read(&temp_mutex, remote(mutex));
mutex = &temp_mutex;
}
#endif
mc_model_checker->process().read(&temp_mutex, remote(mutex));
mutex = &temp_mutex;
}
#endif
+
if(mutex->owner == nullptr)
return true;
if(mutex->owner == nullptr)
return true;
- else
#if HAVE_MC
#if HAVE_MC
+ else if (mc_model_checker != nullptr) {
+ simgrid::mc::Process& modelchecked = mc_model_checker->process();
// TODO, *(mutex->owner) :/
// TODO, *(mutex->owner) :/
- return MC_smx_resolve_process(mutex->owner)->pid ==
- MC_smx_resolve_process(req->issuer)->pid;
-#else
- return mutex->owner->pid == req->issuer->pid;
+ return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid
+ == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid;
+ }
#endif
#endif
+ else
+ return mutex->owner->pid == req->issuer->pid;
}
default:
}
default: