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
Revert "Revert "[mc] Move MC_random() in mc_client_api.cpp""
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
516a312
..
c0f9ab9
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-22,6
+22,10
@@
#include "mc_server.h"
#endif
#include "mc_server.h"
#endif
+#ifdef HAVE_MC
+using simgrid::mc::remote;
+#endif
+
extern "C" {
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
extern "C" {
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
@@
-69,9
+73,7
@@
int MC_request_is_enabled(smx_simcall_t req)
#ifdef HAVE_MC
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
#ifdef HAVE_MC
// Fetch from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_synchro, act, sizeof(temp_synchro),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
}
#endif
act = &temp_synchro;
}
#endif
@@
-94,11
+96,11
@@
int MC_request_is_enabled(smx_simcall_t req)
#ifdef HAVE_MC
s_xbt_dynar_t comms_buffer;
#ifdef HAVE_MC
s_xbt_dynar_t comms_buffer;
- size_t buffer_size;
+ size_t buffer_size
= 0
;
if (mc_mode == MC_MODE_SERVER) {
// Read dynar:
if (mc_mode == MC_MODE_SERVER) {
// Read dynar:
- MC_process_read_simple(&mc_model_checker->process(),
- &comms_buffer,
simcall_comm_waitany__get__comms(req), sizeof(comms_buffer
));
+ mc_model_checker->process().read(
+ &comms_buffer,
remote(simcall_comm_waitany__get__comms(req)
));
assert(comms_buffer.elmsize == sizeof(act));
buffer_size = comms_buffer.elmsize * comms_buffer.used;
comms = &comms_buffer;
assert(comms_buffer.elmsize == sizeof(act));
buffer_size = comms_buffer.elmsize * comms_buffer.used;
comms = &comms_buffer;
@@
-108,8
+110,8
@@
int MC_request_is_enabled(smx_simcall_t req)
// Read all the dynar buffer:
char buffer[buffer_size];
if (mc_mode == MC_MODE_SERVER)
// Read all the dynar buffer:
char buffer[buffer_size];
if (mc_mode == MC_MODE_SERVER)
-
MC_process_read_simple(&mc_model_checker->process(
),
-
buffer, comms->data, sizeof(buffer
));
+
mc_model_checker->process().read_bytes(buffer, sizeof(buffer
),
+
remote(comms->data
));
#else
comms = simcall_comm_waitany__get__comms(req);
#endif
#else
comms = simcall_comm_waitany__get__comms(req);
#endif
@@
-119,9
+121,7
@@
int MC_request_is_enabled(smx_simcall_t req)
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
// Fetch act from MCed memory:
if (mc_mode == MC_MODE_SERVER) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_synchro, act, sizeof(temp_synchro),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
}
else
act = &temp_synchro;
}
else
@@
-138,9
+138,7
@@
int MC_request_is_enabled(smx_simcall_t req)
#ifdef HAVE_MC
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
#ifdef HAVE_MC
s_smx_mutex_t temp_mutex;
if (mc_mode == MC_MODE_SERVER) {
- MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &temp_mutex, mutex, sizeof(temp_mutex),
- MC_PROCESS_INDEX_ANY);
+ mc_model_checker->process().read(&temp_mutex, remote(mutex));
mutex = &temp_mutex;
}
#endif
mutex = &temp_mutex;
}
#endif
@@
-179,12
+177,6
@@
int MC_request_is_visible(smx_simcall_t req)
;
}
;
}
-int MC_random(int min, int max)
-{
- /*FIXME: return mc_current_state->executed_transition->random.value; */
- return simcall_mc_random(min, max);
-}
-
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
static int prng_random(int min, int max)
{
unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;