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
[mc] Move things in simgrid::mc
[simgrid.git]
/
src
/
mc
/
mc_record.cpp
diff --git
a/src/mc/mc_record.cpp
b/src/mc/mc_record.cpp
index
53fe654
..
edd3d44
100644
(file)
--- a/
src/mc/mc_record.cpp
+++ b/
src/mc/mc_record.cpp
@@
-8,18
+8,25
@@
#include <cstdio>
#include <cstdlib>
#include <cstdio>
#include <cstdlib>
-#include <xbt.h>
-#include <simgrid/simix.h>
+#include <xbt/fifo.h>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
-#include "mc_replay.h"
-#include "mc_record.h"
-#include "mc_base.h"
+#include "simgrid/simix.h"
+
+#include "src/simix/smx_private.h"
+#include "src/simix/smx_process_private.h"
+
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_base.h"
#ifdef HAVE_MC
#ifdef HAVE_MC
-#include "mc_private.h"
-#include "mc_state.h"
-#include "mc_smx.h"
-#include "mc_liveness.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_liveness.h"
#endif
extern "C" {
#endif
extern "C" {
@@
-31,7
+38,7
@@
char* MC_record_path = nullptr;
void MC_record_replay(mc_record_item_t start, std::size_t len)
{
void MC_record_replay(mc_record_item_t start, std::size_t len)
{
-
MC_
wait_for_requests();
+
simgrid::mc::
wait_for_requests();
mc_record_item_t end = start + len;
// Choose the recorded simcall and execute it:
mc_record_item_t end = start + len;
// Choose the recorded simcall and execute it:
@@
-50,12
+57,13
@@
void MC_record_replay(mc_record_item_t start, std::size_t len)
smx_simcall_t simcall = &(process->simcall);
if(!simcall || simcall->call == SIMCALL_NONE)
xbt_die("No simcall for this process.");
smx_simcall_t simcall = &(process->simcall);
if(!simcall || simcall->call == SIMCALL_NONE)
xbt_die("No simcall for this process.");
- if (!MC_request_is_visible(simcall) || !MC_request_is_enabled(simcall))
+ if (!simgrid::mc::request_is_visible(simcall)
+ || !simgrid::mc::request_is_enabled(simcall))
xbt_die("Unexpected simcall.");
// Execute the request:
SIMIX_simcall_handle(simcall, item->value);
xbt_die("Unexpected simcall.");
// Execute the request:
SIMIX_simcall_handle(simcall, item->value);
-
MC_
wait_for_requests();
+
simgrid::mc::
wait_for_requests();
}
}
}
}
@@
-180,7
+188,7
@@
void MC_record_replay_from_string(const char* path_string)
void MC_record_replay_init()
{
void MC_record_replay_init()
{
-
mc_time = xbt_new0(double,
simix_process_maxpid);
+
simgrid::mc::processes_time.resize(
simix_process_maxpid);
}
}
}
}