From b7c53df18dcbf388f0dce6d7baa3086436028313 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Thu, 30 Sep 2021 22:00:42 +0200 Subject: [PATCH 1/1] more include cleanups --- examples/c/actor-daemon/actor-daemon.c | 2 +- src/kernel/activity/ActivityImpl.cpp | 4 +++- src/kernel/activity/CommImpl.cpp | 11 +++++------ src/kernel/activity/ConditionVariableImpl.cpp | 1 - src/kernel/activity/ExecImpl.cpp | 14 ++++++-------- src/kernel/activity/IoImpl.cpp | 14 +++++++------- src/kernel/activity/SleepImpl.cpp | 7 ++----- src/kernel/activity/SynchroRaw.cpp | 12 +++++------- src/kernel/actor/ActorImpl.cpp | 16 ++++------------ src/plugins/dirty_page_tracking.cpp | 6 ++++-- src/plugins/file_system/s4u_FileSystem.cpp | 11 ++++++----- src/plugins/host_dvfs.cpp | 15 ++++++--------- src/plugins/host_energy.cpp | 5 +++-- src/plugins/host_load.cpp | 7 +++++-- src/plugins/link_energy_wifi.cpp | 6 ------ src/plugins/link_load.cpp | 7 +++---- src/plugins/vm/VirtualMachineImpl.cpp | 10 +++++----- src/plugins/vm/VirtualMachineImpl.hpp | 7 ++----- src/plugins/vm/VmHostExt.cpp | 4 ++-- src/plugins/vm/VmHostExt.hpp | 4 ++-- src/plugins/vm/VmLiveMigration.cpp | 3 ++- src/plugins/vm/VmLiveMigration.hpp | 1 - src/plugins/vm/s4u_VirtualMachine.cpp | 1 - src/s4u/s4u_Engine.cpp | 2 +- src/s4u/s4u_Link.cpp | 2 +- 25 files changed, 75 insertions(+), 97 deletions(-) diff --git a/examples/c/actor-daemon/actor-daemon.c b/examples/c/actor-daemon/actor-daemon.c index fb36a91686..2a7ffe3824 100644 --- a/examples/c/actor-daemon/actor-daemon.c +++ b/examples/c/actor-daemon/actor-daemon.c @@ -6,8 +6,8 @@ #include "simgrid/actor.h" #include "simgrid/engine.h" #include "simgrid/host.h" +#include "xbt/asserts.h" #include "xbt/log.h" -#include "xbt/sysdep.h" XBT_LOG_NEW_DEFAULT_CATEGORY(actor_daemon, "Messages specific for this example"); diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index 2bf2409cf1..b9b3b05de9 100644 --- a/src/kernel/activity/ActivityImpl.cpp +++ b/src/kernel/activity/ActivityImpl.cpp @@ -3,12 +3,14 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "src/kernel/activity/ActivityImpl.hpp" -#include "simgrid/modelchecker.h" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/mc_replay.hpp" + #include #include // isfinite() diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index 67a94e8726..9b57df5743 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -3,18 +3,17 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include +#include +#include + #include "src/kernel/activity/CommImpl.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/resource/Action.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/modelchecker.h" -#include "simgrid/s4u/Host.hpp" #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/context/Context.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp index b45038143e..1a0a73bf67 100644 --- a/src/kernel/activity/ConditionVariableImpl.cpp +++ b/src/kernel/activity/ConditionVariableImpl.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "simgrid/Exception.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/kernel/actor/SimcallObserver.hpp" diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 7e1615038f..052929c027 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -3,19 +3,17 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include +#include +#include + #include "src/kernel/activity/ExecImpl.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/modelchecker.h" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" - -#include "simgrid/s4u/Host.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index dd4b9bc0d8..cb274dcdb6 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -2,14 +2,14 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/kernel/activity/IoImpl.hpp" + +#include +#include +#include +#include + #include "mc/mc.h" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/resource/Action.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Io.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/kernel/context/Context.hpp" diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index 5a13593ca9..cec6de2d26 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -3,15 +3,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "src/kernel/activity/SleepImpl.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/resource/Action.hpp" -#include "simgrid/s4u/Host.hpp" #include "src/kernel/actor/ActorImpl.hpp" -#include "src/kernel/context/Context.hpp" #include "src/simix/popping_private.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); namespace simgrid { diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp index 2fe20823eb..c01df2b4fc 100644 --- a/src/kernel/activity/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.cpp @@ -3,16 +3,14 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include + #include "src/kernel/activity/SynchroRaw.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/resource/Action.hpp" -#include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "src/kernel/activity/MutexImpl.hpp" -#include "src/kernel/activity/SemaphoreImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/context/Context.hpp" +#include "src/simix/popping_private.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)"); diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index dbc2a553be..d2af1a6f31 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -3,23 +3,15 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/s4u/Actor.hpp" -#include "mc/mc.h" -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Exec.hpp" +#include +#include +#include + #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/kernel/activity/IoImpl.hpp" -#include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" -#include "src/mc/mc_replay.hpp" -#include "src/mc/remote/AppSide.hpp" #if HAVE_SMPI #include "src/smpi/include/private.hpp" #endif #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" #include #include diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp index 9b469dc3c7..18f435eee6 100644 --- a/src/plugins/dirty_page_tracking.cpp +++ b/src/plugins/dirty_page_tracking.cpp @@ -3,8 +3,10 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/plugins/live_migration.h" -#include "simgrid/s4u/Exec.hpp" +#include +#include +#include + #include "src/kernel/activity/ExecImpl.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index 7a102b59d2..16c19cce46 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -4,20 +4,21 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include #include +#include #include +#include +#include +#include #include +#include #include -#include "src/surf/HostImpl.hpp" +#include "src/surf/surf_interface.hpp" -#include #include -#include #include #include -#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index bb830cf074..9b8e037966 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -3,21 +3,18 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/plugins/dvfs.h" -#include "simgrid/plugins/load.h" -#include "simgrid/s4u/Engine.hpp" +#include +#include +#include + #include "src/internal_config.h" // HAVE_SMPI -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/network_interface.hpp" #if HAVE_SMPI +#include "src/smpi/include/smpi_request.hpp" #include "src/smpi/plugins/ampi/ampi.hpp" #endif -#include #include -#if HAVE_SMPI -#include "src/smpi/include/smpi_request.hpp" -#endif SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init) diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index b72b8c765a..fe9a948bcd 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -7,9 +7,10 @@ #include #include #include +#include +#include +#include -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" #include diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index 6f00606d8b..278dab8d0e 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -4,10 +4,13 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include +#include +#include +#include +#include #include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/surf_interface.hpp" // Makes sure that this plugin can be activated from the command line with ``--cfg=plugin:host_load`` SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init) diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp index dca8c0453d..acd2dc56d4 100644 --- a/src/plugins/link_energy_wifi.cpp +++ b/src/plugins/link_energy_wifi.cpp @@ -3,21 +3,15 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include #include #include -#include #include -#include #include "src/surf/network_interface.hpp" #include "src/surf/network_wifi.hpp" -#include "src/surf/surf_interface.hpp" -#include "src/kernel/lmm/maxmin.hpp" #include #include -#include SIMGRID_REGISTER_PLUGIN(link_energy_wifi, "Energy wifi test", &sg_wifi_energy_plugin_init); /** @defgroup plugin_link_energy_wifi Plugin WiFi energy diff --git a/src/plugins/link_load.cpp b/src/plugins/link_load.cpp index 6936082b52..719b96afe3 100644 --- a/src/plugins/link_load.cpp +++ b/src/plugins/link_load.cpp @@ -3,11 +3,10 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/plugins/load.h" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Link.hpp" +#include +#include + #include "src/surf/network_interface.hpp" -#include "src/surf/surf_interface.hpp" #include diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 9875260ff8..e6158522e1 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -3,14 +3,14 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/NetZoneImpl.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" +#include +#include +#include + #include "simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_cas01.hpp" #include "src/surf/cpu_ti.hpp" diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp index 7015fc6c58..5104288ef8 100644 --- a/src/plugins/vm/VirtualMachineImpl.hpp +++ b/src/plugins/vm/VirtualMachineImpl.hpp @@ -3,12 +3,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/s4u/VirtualMachine.hpp" -#include "src/kernel/actor/ActorImpl.hpp" +#include + #include "src/surf/HostImpl.hpp" -#include -#include -#include #ifndef VM_INTERFACE_HPP_ #define VM_INTERFACE_HPP_ diff --git a/src/plugins/vm/VmHostExt.cpp b/src/plugins/vm/VmHostExt.cpp index ff5ac07315..454e8e1ec4 100644 --- a/src/plugins/vm/VmHostExt.cpp +++ b/src/plugins/vm/VmHostExt.cpp @@ -16,5 +16,5 @@ void VmHostExt::ensureVmExtInstalled() if (not EXTENSION_ID.valid()) EXTENSION_ID = simgrid::s4u::Host::extension_create(); } -} -} +} // namespace vm +} // namespace simgrid diff --git a/src/plugins/vm/VmHostExt.hpp b/src/plugins/vm/VmHostExt.hpp index ec89754ffb..624eb20106 100644 --- a/src/plugins/vm/VmHostExt.hpp +++ b/src/plugins/vm/VmHostExt.hpp @@ -20,7 +20,7 @@ public: static void ensureVmExtInstalled(); }; -} -} +} // namespace vm +} // namespace simgrid #endif /* VM_HOST_INFO_HPP_ */ diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index f0ec902276..81c554e135 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -3,8 +3,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "src/plugins/vm/VmLiveMigration.hpp" -#include "simgrid/Exception.hpp" #include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp index d0893c052f..a9a2755f04 100644 --- a/src/plugins/vm/VmLiveMigration.hpp +++ b/src/plugins/vm/VmLiveMigration.hpp @@ -3,7 +3,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/s4u/VirtualMachine.hpp" diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index a61da7cdb9..a317f754df 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "src/plugins/vm/VirtualMachineImpl.hpp" diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index bf61e37efe..8f2ba76a8c 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -8,7 +8,7 @@ #include #include #include -// + #include "mc/mc.h" #include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index 493d5c463a..ec1849223e 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -6,8 +6,8 @@ #include #include #include -#include #include +#include #include #include "src/surf/SplitDuplexLinkImpl.hpp" -- 2.20.1