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
Inline empty ctor; use default dtor.
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
944de52
..
4d6c6e3
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-20
20
. 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. */
@@
-69,7
+69,6
@@
void MC_init_dot_output()
fprintf(dot_output,
"digraph graphname{\n fixedsize=true; rankdir=TB; ranksep=.25; edge [fontsize=12]; node [fontsize=10, shape=circle,width=.5 ]; graph [resolution=20, fontsize=10];\n");
fprintf(dot_output,
"digraph graphname{\n fixedsize=true; rankdir=TB; ranksep=.25; edge [fontsize=12]; node [fontsize=10, shape=circle,width=.5 ]; graph [resolution=20, fontsize=10];\n");
-
}
/******************************* Core of MC *******************************/
}
/******************************* Core of MC *******************************/
@@
-77,7
+76,7
@@
void MC_init_dot_output()
void MC_run()
{
void MC_run()
{
- simgrid::mc::processes_time.resize(
SIMIX_process_
get_maxpid());
+ simgrid::mc::processes_time.resize(
simgrid::kernel::actor::
get_maxpid());
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
simgrid::mc::Client::get()->main_loop();
MC_ignore_heap(simgrid::mc::processes_time.data(),
simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
simgrid::mc::Client::get()->main_loop();
@@
-86,7
+85,7
@@
void MC_run()
void MC_show_deadlock()
{
XBT_INFO("**************************");
void MC_show_deadlock()
{
XBT_INFO("**************************");
- XBT_INFO("*** DEAD
-
LOCK DETECTED ***");
+ XBT_INFO("*** DEADLOCK DETECTED ***");
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
XBT_INFO("**************************");
XBT_INFO("Counter-example execution trace:");
for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
@@
-106,22
+105,22
@@
void MC_automaton_load(const char *file)
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-void dumpStack(FILE* file, unw_cursor_t
&&
cursor)
+void dumpStack(FILE* file, unw_cursor_t
*
cursor)
{
int nframe = 0;
char buffer[100];
unw_word_t off;
do {
{
int nframe = 0;
char buffer[100];
unw_word_t off;
do {
- const char* name = not unw_get_proc_name(
&
cursor, buffer, 100, &off) ? buffer : "?";
+ const char* name = not unw_get_proc_name(cursor, buffer, 100, &off) ? buffer : "?";
// Unmangle C++ names:
auto realname = simgrid::xbt::demangle(name);
#if defined(__x86_64__)
unw_word_t rip = 0;
unw_word_t rsp = 0;
// Unmangle C++ names:
auto realname = simgrid::xbt::demangle(name);
#if defined(__x86_64__)
unw_word_t rip = 0;
unw_word_t rsp = 0;
- unw_get_reg(
&
cursor, UNW_X86_64_RIP, &rip);
- unw_get_reg(
&
cursor, UNW_X86_64_RSP, &rsp);
+ unw_get_reg(cursor, UNW_X86_64_RIP, &rip);
+ unw_get_reg(cursor, UNW_X86_64_RSP, &rsp);
fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", nframe, realname.get(), (std::uint64_t)rip,
(std::uint64_t)rsp);
#else
fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", nframe, realname.get(), (std::uint64_t)rip,
(std::uint64_t)rsp);
#else
@@
-129,14
+128,14
@@
void dumpStack(FILE* file, unw_cursor_t&& cursor)
#endif
++nframe;
#endif
++nframe;
- } while
(unw_step(&
cursor));
+ } while
(unw_step(
cursor));
}
}
}
#endif
}
}
}
#endif
-double MC_process_clock_get(
smx_actor_t
process)
+double MC_process_clock_get(
const simgrid::kernel::actor::ActorImpl*
process)
{
if (simgrid::mc::processes_time.empty())
return 0;
{
if (simgrid::mc::processes_time.empty())
return 0;
@@
-145,7
+144,7
@@
double MC_process_clock_get(smx_actor_t process)
return -1;
}
return -1;
}
-void MC_process_clock_add(
smx_actor_t
process, double amount)
+void MC_process_clock_add(
const simgrid::kernel::actor::ActorImpl*
process, double amount)
{
simgrid::mc::processes_time[process->get_pid()] += amount;
}
{
simgrid::mc::processes_time[process->get_pid()] += amount;
}