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
d6d0b51
..
0204bbd
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2017. 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. */
@@
-13,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"
@@
-27,24
+26,24
@@
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
-#include "src/simix/
smx_process_private.h
"
+#include "src/simix/
ActorImpl.hpp
"
-#if HAVE_MC
-#include <libunwind.h>
-#include "src/mc/mc_comm_pattern.h"
+#if SIMGRID_HAVE_MC
+#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.hpp"
+#include <libunwind.h>
#endif
#endif
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/Transition.hpp"
+#include "src/mc/mc_record.h"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
@@
-56,7
+55,7
@@
std::vector<double> processes_time;
}
}
}
}
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
/* Liveness */
/* Liveness */
@@
-94,23
+93,24
@@
void MC_init_dot_output()
void MC_run()
{
void MC_run()
{
- simgrid::mc::processes_time.resize(
simix_process_maxpid
);
+ 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]));
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
- smx_process_t process;
- xbt_swag_foreach(process, simix_global->process_list)
- MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
+ for (auto const& kv : simix_global->process_list) {
+ smx_actor_t actor = kv.second;
+ MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
+ }
simgrid::mc::Client::get()->mainLoop();
simgrid::mc::processes_time.clear();
}
simgrid::mc::Client::get()->mainLoop();
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();
}
@@
-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;
@@
-177,7
+177,7
@@
static void MC_dump_stacks(FILE* file)
}
#endif
}
#endif
-double MC_process_clock_get(smx_
process
_t process)
+double MC_process_clock_get(smx_
actor
_t process)
{
if (simgrid::mc::processes_time.empty())
return 0;
{
if (simgrid::mc::processes_time.empty())
return 0;
@@
-186,7
+186,7
@@
double MC_process_clock_get(smx_process_t process)
return -1;
}
return -1;
}
-void MC_process_clock_add(smx_
process
_t process, double amount)
+void MC_process_clock_add(smx_
actor
_t process, double amount)
{
simgrid::mc::processes_time[process->pid] += amount;
}
{
simgrid::mc::processes_time[process->pid] += amount;
}