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
[sonar] Replace redundant type with "auto" (include/ and src/).
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
36454f6
..
63bdd27
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-21,7
+21,7
@@
#include "src/surf/xml/platf.hpp"
#if SIMGRID_HAVE_MC
#include "src/surf/xml/platf.hpp"
#if SIMGRID_HAVE_MC
-#include "src/mc/remote/
Client
.hpp"
+#include "src/mc/remote/
AppSide
.hpp"
#endif
#endif
@@
-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
@@
-136,7
+136,7
@@
namespace simix {
Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
-
Timer* timer
= new Timer(date, std::move(callback));
+
auto* timer
= new Timer(date, std::move(callback));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
return timer;
}
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
return timer;
}
@@
-198,7
+198,7
@@
void Global::run_all_actors()
}
/** Wake up all actors waiting for a Surf action to finish */
}
/** Wake up all actors waiting for a Surf action to finish */
-void Global::wake_all_waiting_actors()
+void Global::wake_all_waiting_actors()
const
{
for (auto const& model : all_existing_models) {
kernel::resource::Action* action;
{
for (auto const& model : all_existing_models) {
kernel::resource::Action* action;
@@
-220,7
+220,7
@@
void Global::wake_all_waiting_actors()
}
}
}
}
-void Global::display_all_actor_status()
+void Global::display_all_actor_status()
const
{
XBT_INFO("%zu actors are still running, waiting for something.", process_list.size());
/* List the actors and their state */
{
XBT_INFO("%zu actors are still running, waiting for something.", process_list.size());
/* List the actors and their state */
@@
-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());
}
@@
-283,7
+279,7
@@
void SIMIX_global_init(int *argc, char **argv)
#if SIMGRID_HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
#if SIMGRID_HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
- simgrid::mc::
Client
::initialize();
+ simgrid::mc::
AppSide
::initialize();
#endif
if (simix_global == nullptr) {
#endif
if (simix_global == nullptr) {
@@
-334,7
+330,7
@@
void SIMIX_clean()
}
#if HAVE_SMPI
}
#if HAVE_SMPI
- if (
simix_global->process_list.size() > 0
) {
+ if (
not simix_global->process_list.empty()
) {
if(smpi_process()->initialized()){
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
if(smpi_process()->initialized()){
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
@@
-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);
}
}