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
Added reference link to comment in MakeLib.cmake
[simgrid.git]
/
src
/
mc
/
mc_smx.cpp
diff --git
a/src/mc/mc_smx.cpp
b/src/mc/mc_smx.cpp
index
12d9216
..
ab32689
100644
(file)
--- a/
src/mc/mc_smx.cpp
+++ b/
src/mc/mc_smx.cpp
@@
-19,11
+19,7
@@
static
void MC_smx_process_info_clear(mc_smx_process_info_t p)
{
p->hostname = NULL;
void MC_smx_process_info_clear(mc_smx_process_info_t p)
{
p->hostname = NULL;
-
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
free(p->name);
free(p->name);
- mmalloc_set_current_heap(heap);
-
p->name = NULL;
}
p->name = NULL;
}
@@
-90,11
+86,11
@@
static void MC_process_refresh_simix_process_list(
void MC_process_smx_refresh(mc_process_t process)
{
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;
if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
return;
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
-
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
// simix_global_p = REMOTE(simix_global);
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
// simix_global_p = REMOTE(simix_global);
@@
-112,7
+108,6
@@
void MC_process_smx_refresh(mc_process_t process)
process, process->smx_old_process_infos, simix_global.process_to_destroy);
process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
process, process->smx_old_process_infos, simix_global.process_to_destroy);
process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
- mmalloc_set_current_heap(heap);
}
/** Get the issuer of a simcall (`req->issuer`)
}
/** Get the issuer of a simcall (`req->issuer`)
@@
-126,7
+121,7
@@
void MC_process_smx_refresh(mc_process_t process)
*/
smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
{
*/
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());
return req->issuer;
MC_process_smx_refresh(&mc_model_checker->process());
@@
-152,7
+147,7
@@
smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
{
if (!process_remote_address)
return NULL;
{
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);
return process_remote_address;
mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address);
@@
-164,7
+159,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)
{
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;
xbt_die("No process_info for local process is not enabled.");
unsigned index;
@@
-180,7
+175,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)
{
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();
return SIMIX_host_get_name(p->smx_host);
mc_process_t process = &mc_model_checker->process();
@@
-205,23
+200,21
@@
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();
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;
mc_smx_process_info_t info = MC_smx_process_get_info(p);
if (!info->name) {
return p->name;
if (!p->name)
return NULL;
mc_smx_process_info_t info = MC_smx_process_get_info(p);
if (!info->name) {
- xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
info->name = MC_process_read_string(process, p->name);
info->name = MC_process_read_string(process, p->name);
- mmalloc_set_current_heap(heap);
}
return info->name;
}
int MC_smpi_process_count(void)
{
}
return info->name;
}
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;
return smpi_process_count();
else {
int res;