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
that's not a double
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index 2f20481f400804e9578b88c2e6d6a8c6612b7b27..d8a18c0749c3b338ef87537c4b8c437958005e41 100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-34,7
+34,7
@@
void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
-config::Flag<
double
> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
+config::Flag<
bool
> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
} // namespace simix
} // namespace simgrid
} // namespace simix
} // namespace simgrid
@@
-228,32
+228,28
@@
void Global::display_all_actor_status()
for (auto const& kv : process_list) {
kernel::actor::ActorImpl* actor = kv.second;
for (auto const& kv : process_list) {
kernel::actor::ActorImpl* actor = kv.second;
- if (actor->waiting_synchro) {
+ if (actor->waiting_synchro
_
) {
const char* synchro_description = "unknown";
const char* synchro_description = "unknown";
- // we don't care about the Activity type to get its name, use RawImpl
- const char* name = boost::static_pointer_cast<kernel::activity::ActivityImpl_T<kernel::activity::RawImpl>>(
- actor->waiting_synchro)
- ->get_cname();
- if (boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(actor->waiting_synchro
_
) != nullptr)
synchro_description = "execution";
synchro_description = "execution";
- if (boost::dynamic_pointer_cast<kernel::activity::CommImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::CommImpl>(actor->waiting_synchro
_
) != nullptr)
synchro_description = "communication";
synchro_description = "communication";
- if (boost::dynamic_pointer_cast<kernel::activity::SleepImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::SleepImpl>(actor->waiting_synchro
_
) != nullptr)
synchro_description = "sleeping";
synchro_description = "sleeping";
- if (boost::dynamic_pointer_cast<kernel::activity::RawImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::RawImpl>(actor->waiting_synchro
_
) != nullptr)
synchro_description = "synchronization";
synchro_description = "synchronization";
- if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro
_
) != nullptr)
synchro_description = "I/O";
synchro_description = "I/O";
- XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %
p
(%s) in state %d to finish", actor->get_pid(),
+ XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %
#zx
(%s) in state %d to finish", actor->get_pid(),
actor->get_cname(), actor->get_host()->get_cname(), synchro_description,
actor->get_cname(), actor->get_host()->get_cname(), synchro_description,
- (xbt_log_no_loc ? (
void*)0xDEADBEEF : actor->waiting_synchro.get()), name
,
-
(int)actor->waiting_synchro
->state_);
+ (xbt_log_no_loc ? (
size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get())
,
+
actor->waiting_synchro_->get_cname(), (int)actor->waiting_synchro_
->state_);
} else {
XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
}
} else {
XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
}
@@
-506,7
+502,7
@@
void SIMIX_run()
*/
for (auto const& actor : simix_global->actors_that_ran) {
*/
for (auto const& actor : simix_global->actors_that_ran) {
- if (actor->simcall.call_ != SIMCALL_NONE) {
+ if (actor->simcall
_
.call_ != SIMCALL_NONE) {
actor->simcall_handle(0);
}
}
actor->simcall_handle(0);
}
}