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
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
d5a8195
..
c225615
100644
(file)
--- a/
src/mc/ModelChecker.cpp
+++ b/
src/mc/ModelChecker.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2018. 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. */
@@
-19,17
+18,17
@@
#include "xbt/log.h"
#include "xbt/system_error.hpp"
#include "xbt/log.h"
#include "xbt/system_error.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.h
pp
"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/ModelChecker.hpp"
-#include "src/mc/PageStore.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/checker/Checker.hpp"
-#include "src/mc/mc_exit.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_record.h"
+#include "src/mc/mc_exit.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
#include "src/mc/remote/mc_protocol.h"
#include "src/mc/remote/mc_protocol.h"
+#include "src/mc/sosp/PageStore.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
@@
-96,7
+95,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.get().empty(
))
MC_init_dot_output();
setup_ignore();
MC_init_dot_output();
setup_ignore();
@@
-147,7
+146,7
@@
void ModelChecker::shutdown()
simgrid::mc::RemoteClient* process = &this->process();
if (process->running()) {
XBT_DEBUG("Killing process");
simgrid::mc::RemoteClient* process = &this->process();
if (process->running()) {
XBT_DEBUG("Killing process");
- kill(process->pid(), SIG
TERM
);
+ kill(process->pid(), SIG
KILL
);
process->terminate();
}
}
process->terminate();
}
}
@@
-175,7
+174,7
@@
static void MC_report_crash(int status)
XBT_INFO("No core dump was generated by the system.");
XBT_INFO("Counter-example execution trace:");
simgrid::mc::dumpRecordPath();
XBT_INFO("No core dump was generated by the system.");
XBT_INFO("Counter-example execution trace:");
simgrid::mc::dumpRecordPath();
- for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+ for (auto
const
& s : mc_model_checker->getChecker()->getTextualTrace())
XBT_INFO("%s", s.c_str());
simgrid::mc::session->logState();
XBT_INFO("Stack trace:");
XBT_INFO("%s", s.c_str());
simgrid::mc::session->logState();
XBT_INFO("Stack trace:");
@@
-189,14
+188,14
@@
static void MC_report_assertion_error()
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
simgrid::mc::dumpRecordPath();
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
simgrid::mc::dumpRecordPath();
- for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+ for (auto
const
& s : mc_model_checker->getChecker()->getTextualTrace())
XBT_INFO("%s", s.c_str());
simgrid::mc::session->logState();
}
bool ModelChecker::handle_message(char* buffer, ssize_t size)
{
XBT_INFO("%s", s.c_str());
simgrid::mc::session->logState();
}
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));
@@
-375,13
+374,8
@@
void ModelChecker::handle_waitpid()
void ModelChecker::on_signal(int signo)
{
void ModelChecker::on_signal(int signo)
{
- switch(signo) {
- case SIGCHLD:
+ if (signo == SIGCHLD)
this->handle_waitpid();
this->handle_waitpid();
- break;
- default:
- break;
- }
}
void ModelChecker::wait_for_requests()
}
void ModelChecker::wait_for_requests()
@@
-393,7
+387,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;
@@
-409,7
+403,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");