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
stringify (a lot)
[simgrid.git]
/
src
/
mc
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
d657f2a
..
53ebd7e
100644
(file)
--- a/
src/mc/ModelChecker.cpp
+++ b/
src/mc/ModelChecker.cpp
@@
-34,6
+34,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
+extern std::string _sg_mc_dot_output_file;
using simgrid::mc::remote;
using simgrid::mc::remote;
@@
-96,7
+97,7
@@
void ModelChecker::start()
process_->init();
process_->init();
- if (
(_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0'
))
+ if (
not _sg_mc_dot_output_file.empty(
))
MC_init_dot_output();
setup_ignore();
MC_init_dot_output();
setup_ignore();
@@
-196,7
+197,7
@@
static void MC_report_assertion_error()
bool ModelChecker::handle_message(char* buffer, ssize_t size)
{
bool ModelChecker::handle_message(char* buffer, ssize_t size)
{
- mc_message_t base_message;
+
s_
mc_message_t base_message;
if (size < (ssize_t) sizeof(base_message))
xbt_die("Broken message");
memcpy(&base_message, buffer, sizeof(base_message));
if (size < (ssize_t) sizeof(base_message))
xbt_die("Broken message");
memcpy(&base_message, buffer, sizeof(base_message));
@@
-388,7
+389,7
@@
void ModelChecker::wait_for_requests()
void ModelChecker::handle_simcall(Transition const& transition)
{
void ModelChecker::handle_simcall(Transition const& transition)
{
- s_mc_message_simcall_handle m;
+ s_mc_message_simcall_handle
_t
m;
memset(&m, 0, sizeof(m));
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = transition.pid;
memset(&m, 0, sizeof(m));
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = transition.pid;
@@
-404,7
+405,7
@@
bool ModelChecker::checkDeadlock()
int res;
if ((res = this->process().getChannel().send(MC_MESSAGE_DEADLOCK_CHECK)))
xbt_die("Could not check deadlock state");
int res;
if ((res = this->process().getChannel().send(MC_MESSAGE_DEADLOCK_CHECK)))
xbt_die("Could not check deadlock state");
- mc_message_int_t message;
+
s_
mc_message_int_t message;
ssize_t s = mc_model_checker->process().getChannel().receive(message);
if (s == -1)
xbt_die("Could not receive message");
ssize_t s = mc_model_checker->process().getChannel().receive(message);
if (s == -1)
xbt_die("Could not receive message");