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] Remove compatibility stuff
[simgrid.git]
/
src
/
mc
/
mc_smx.cpp
diff --git
a/src/mc/mc_smx.cpp
b/src/mc/mc_smx.cpp
index
b203933
..
6def3fd
100644
(file)
--- a/
src/mc/mc_smx.cpp
+++ b/
src/mc/mc_smx.cpp
@@
-60,8
+60,8
@@
static void MC_process_refresh_simix_process_list(
{
// swag = REMOTE(*simix_global->process_list)
s_xbt_swag_t swag;
- MC_process_read(process,
MC_PROCESS_NO_FLAG
, &swag, remote_swag, sizeof(swag),
-
MC_PROCESS_INDEX_ANY
);
+ MC_process_read(process,
simgrid::mc::AddressSpace::Normal
, &swag, remote_swag, sizeof(swag),
+
simgrid::mc::ProcessIndexAny
);
smx_process_t p;
xbt_dynar_reset(target);
@@
-74,8
+74,8
@@
static void MC_process_refresh_simix_process_list(
info.address = p;
info.name = NULL;
info.hostname = NULL;
- MC_process_read(process,
MC_PROCESS_NO_FLAG
,
- &info.copy, p, sizeof(info.copy),
MC_PROCESS_INDEX_ANY
);
+ MC_process_read(process,
simgrid::mc::AddressSpace::Normal
,
+ &info.copy, p, sizeof(info.copy),
simgrid::mc::ProcessIndexAny
);
xbt_dynar_push(target, &info);
// Lookup next process address:
@@
-86,6
+86,8
@@
static void MC_process_refresh_simix_process_list(
void MC_process_smx_refresh(mc_process_t process)
{
+ xbt_assert(mc_mode == MC_MODE_SERVER);
+ xbt_assert(!MC_process_is_self(process));
if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
return;
@@
-97,8
+99,9
@@
void MC_process_smx_refresh(mc_process_t process)
// simix_global = REMOTE(*simix_global)
s_smx_global_t simix_global;
- MC_process_read(process, MC_PROCESS_NO_FLAG, &simix_global, simix_global_p, sizeof(simix_global),
- MC_PROCESS_INDEX_ANY);
+ MC_process_read(process, simgrid::mc::AddressSpace::Normal, &simix_global,
+ simix_global_p, sizeof(simix_global),
+ simgrid::mc::ProcessIndexAny);
MC_process_refresh_simix_process_list(
process, process->smx_process_infos, simix_global.process_list);
@@
-119,7
+122,7
@@
void MC_process_smx_refresh(mc_process_t process)
*/
smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
{
- if (
MC_process_is_self(&mc_model_checker->process())
)
+ if (
mc_mode == MC_MODE_CLIENT
)
return req->issuer;
MC_process_smx_refresh(&mc_model_checker->process());
@@
-145,7
+148,7
@@
smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
{
if (!process_remote_address)
return NULL;
- if (
MC_process_is_self(&mc_model_checker->process())
)
+ if (
mc_mode == MC_MODE_CLIENT
)
return process_remote_address;
mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address);
@@
-157,7
+160,7
@@
smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address)
{
- if (
MC_process_is_self(&mc_model_checker->process())
)
+ if (
mc_mode == MC_MODE_CLIENT
)
xbt_die("No process_info for local process is not enabled.");
unsigned index;
@@
-173,7
+176,7
@@
mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_a
const char* MC_smx_process_get_host_name(smx_process_t p)
{
- if (
MC_process_is_self(&mc_model_checker->process())
)
+ if (
mc_mode == MC_MODE_CLIENT
)
return SIMIX_host_get_name(p->smx_host);
mc_process_t process = &mc_model_checker->process();
@@
-198,7
+201,7
@@
const char* MC_smx_process_get_host_name(smx_process_t p)
const char* MC_smx_process_get_name(smx_process_t p)
{
mc_process_t process = &mc_model_checker->process();
- if (
MC_process_is_self(process)
)
+ if (
mc_mode == MC_MODE_CLIENT
)
return p->name;
if (!p->name)
return NULL;
@@
-212,7
+215,7
@@
const char* MC_smx_process_get_name(smx_process_t p)
int MC_smpi_process_count(void)
{
- if (
MC_process_is_self(&mc_model_checker->process())
)
+ if (
mc_mode == MC_MODE_CLIENT
)
return smpi_process_count();
else {
int res;