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 github.com:simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
3d596ab
..
07eeace
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,15
+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/checker/Checker.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_private.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"
@@
-104,7
+104,7
@@
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("*** DEAD-LOCK DETECTED ***");
@@
-133,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;