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
add some coverage in fortran bindings
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
9b8ce3c
..
c9b5ba6
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-201
9
. 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. */
@@
-26,7
+26,7
@@
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
-#include "src/
simix
/ActorImpl.hpp"
+#include "src/
kernel/actor
/ActorImpl.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
@@
-35,8
+35,8
@@
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_safety.hpp"
#include "src/mc/mc_smx.hpp"
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_safety.hpp"
#include "src/mc/mc_smx.hpp"
-#include "src/mc/mc_snapshot.hpp"
#include "src/mc/mc_unw.hpp"
#include "src/mc/mc_unw.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
#include <libunwind.h>
#endif
#include <libunwind.h>
#endif
@@
-122,7
+122,7
@@
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];
{
int nframe = 0;
char buffer[100];
@@
-165,7
+165,7
@@
static void MC_dump_stacks(FILE* file)
context.initialize(&mc_model_checker->process(), &raw_context);
unw_cursor_t cursor = context.cursor();
context.initialize(&mc_model_checker->process(), &raw_context);
unw_cursor_t cursor = context.cursor();
- simgrid::mc::dumpStack(file,
cursor
);
+ simgrid::mc::dumpStack(file,
std::move(cursor)
);
}
}
#endif
}
}
#endif
@@
-175,11
+175,11
@@
double MC_process_clock_get(smx_actor_t process)
if (simgrid::mc::processes_time.empty())
return 0;
if (process != nullptr)
if (simgrid::mc::processes_time.empty())
return 0;
if (process != nullptr)
- return simgrid::mc::processes_time[process->
pid_
];
+ return simgrid::mc::processes_time[process->
get_pid()
];
return -1;
}
void MC_process_clock_add(smx_actor_t process, double amount)
{
return -1;
}
void MC_process_clock_add(smx_actor_t process, double amount)
{
- simgrid::mc::processes_time[process->
pid_
] += amount;
+ simgrid::mc::processes_time[process->
get_pid()
] += amount;
}
}