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
fix (#220) ?
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
4ab05de
..
f85660a
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
7
. 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. */
@@
-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
@@
-47,8
+47,6
@@
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)");
-extern std::string _sg_mc_dot_output_file;
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-78,7
+76,7
@@
FILE *dot_output = nullptr;
void MC_init_dot_output()
{
void MC_init_dot_output()
{
- dot_output = fopen(_sg_mc_dot_output_file.c_str(), "w");
+ dot_output = fopen(_sg_mc_dot_output_file.
get().
c_str(), "w");
if (dot_output == nullptr) {
perror("Error open dot output file");
if (dot_output == nullptr) {
perror("Error open dot output file");
@@
-177,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;
}
}