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 a message to the user to specify our requirement for Boost version
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
b84e5eb
..
6f985f1
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-40,14
+40,9
@@
#include "src/mc/mc_record.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_record.h"
#include "src/mc/mc_protocol.h"
-#include "src/mc/
mc_client.h
"
+#include "src/mc/
Client.hpp
"
-extern "C" {
-
-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)");
e_mc_mode_t mc_mode;
e_mc_mode_t mc_mode;
@@
-144,7
+139,7
@@
void MC_run()
{
mc_mode = MC_MODE_CLIENT;
MC_init();
{
mc_mode = MC_MODE_CLIENT;
MC_init();
-
MC_client_main_l
oop();
+
simgrid::mc::Client::get()->mainL
oop();
}
void MC_exit(void)
}
void MC_exit(void)
@@
-159,10
+154,10
@@
int MC_deadlock_check()
{
if (mc_mode == MC_MODE_SERVER) {
int res;
{
if (mc_mode == MC_MODE_SERVER) {
int res;
- if ((res = mc_model_checker->process().
send_message
(MC_MESSAGE_DEADLOCK_CHECK)))
+ if ((res = mc_model_checker->process().
getChannel().send
(MC_MESSAGE_DEADLOCK_CHECK)))
xbt_die("Could not check deadlock state");
s_mc_int_message_t message;
xbt_die("Could not check deadlock state");
s_mc_int_message_t message;
- ssize_t s = mc_model_checker->process().
receive_messag
e(message);
+ ssize_t s = mc_model_checker->process().
getChannel().receiv
e(message);
if (s == -1)
xbt_die("Could not receive message");
if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY)
if (s == -1)
xbt_die("Could not receive message");
if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY)