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
Really kill the process.
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
b3140e1
..
0204bbd
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-12,9
+12,9
@@
#include <vector>
#include <vector>
-#include
<xbt/dynar.h>
-#include
<xbt/automaton.h>
-#include
<xbt/swag.h>
+#include
"xbt/automaton.h"
+#include
"xbt/dynar.h"
+#include
"xbt/swag.h"
#include "mc_base.h"
#include "mc_base.h"
@@
-29,16
+29,15
@@
#include "src/simix/ActorImpl.hpp"
#if SIMGRID_HAVE_MC
#include "src/simix/ActorImpl.hpp"
#if SIMGRID_HAVE_MC
-#include
<libunwind.h>
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_
ignor
e.h"
+#include
"src/mc/checker/Checker.hpp"
+#include "src/mc/mc_comm_pattern.h
pp
"
+#include "src/mc/mc_
privat
e.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
+#include "src/mc/mc_smx.h"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_snapshot.h"
-#include "src/mc/mc_private.h"
#include "src/mc/mc_unw.h"
#include "src/mc/mc_unw.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/checker/Checker.hpp"
+#include <libunwind.h>
#endif
#include "src/mc/Transition.hpp"
#endif
#include "src/mc/Transition.hpp"
@@
-97,7
+96,7
@@
void MC_run()
simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
- for (auto kv : simix_global->process_list) {
+ for (auto
const&
kv : simix_global->process_list) {
smx_actor_t actor = kv.second;
MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
}
smx_actor_t actor = kv.second;
MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
}
@@
-105,13
+104,13
@@
void MC_run()
simgrid::mc::processes_time.clear();
}
simgrid::mc::processes_time.clear();
}
-void MC_show_deadlock(
void
)
+void MC_show_deadlock()
{
XBT_INFO("**************************");
XBT_INFO("*** DEAD-LOCK DETECTED ***");
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
{
XBT_INFO("**************************");
XBT_INFO("*** DEAD-LOCK DETECTED ***");
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
- 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("%s", s.c_str());
simgrid::mc::session->logState();
}
@@
-134,7
+133,7
@@
void dumpStack(FILE* file, unw_cursor_t cursor)
unw_word_t off;
do {
unw_word_t off;
do {
- const char
* name = !
unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
+ const char
* name = not
unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
int status;
int status;