From: SUTER Frederic Date: Thu, 30 Sep 2021 17:07:47 +0000 (+0200) Subject: include cleanups in src/s4u X-Git-Tag: v3.29~25 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59251ff676c562b79573e3561166e4351e4ad11e include cleanups in src/s4u --- diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index ae3846b588..d07506a910 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -3,14 +3,13 @@ /* 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 "xbt/log.h" - -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Activity.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "simgrid/s4u/Io.hpp" -#include "src/kernel/activity/ActivityImpl.hpp" +#include +#include +#include +#include +#include +#include + #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 182c08d037..77b3806315 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -3,21 +3,22 @@ /* 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/Exception.hpp" -#include "simgrid/actor.h" -#include "simgrid/modelchecker.h" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/VirtualMachine.hpp" +#include +#include +#include +#include +#include +#include +#include + #include "src/include/mc/mc.h" #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" +#include "src/kernel/context/Context.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/HostImpl.hpp" #include -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_actor, s4u, "S4U actors"); diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp index f1e449be69..ff34621de7 100644 --- a/src/s4u/s4u_Barrier.cpp +++ b/src/s4u/s4u_Barrier.cpp @@ -3,14 +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 - -#include "simgrid/Exception.hpp" -#include "simgrid/barrier.h" -#include "simgrid/s4u/Barrier.hpp" -#include "simgrid/simix.h" -#include "xbt/log.hpp" +#include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier"); diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index a359f506d5..7a699a707e 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -3,15 +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 "src/msg/msg_private.hpp" -#include "xbt/log.h" - -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Mailbox.hpp" +//#include "src/msg/msg_private.hpp" +//#include "xbt/log.h" +#include #include +#include +#include +#include + +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous communications"); diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp index cfced69bdc..67c3229b40 100644 --- a/src/s4u/s4u_ConditionVariable.cpp +++ b/src/s4u/s4u_ConditionVariable.cpp @@ -3,16 +3,13 @@ /* 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/cond.h" -#include "simgrid/forward.h" -#include "simgrid/s4u/ConditionVariable.hpp" -#include "simgrid/simix.h" +#include +#include +#include + #include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "src/kernel/activity/MutexImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "xbt/log.hpp" -#include #include namespace simgrid { diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp index e9d72220dd..c64af72c22 100644 --- a/src/s4u/s4u_Disk.cpp +++ b/src/s4u/s4u_Disk.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/s4u/Disk.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Io.hpp" -#include "simgrid/simix.hpp" +#include +#include +#include + #include "src/kernel/resource/DiskImpl.hpp" namespace simgrid { diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 67d048a956..bf61e37efe 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -5,23 +5,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 -#include +#include #include -#include -#include -#include -#include - +// #include "mc/mc.h" #include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/actor/ActorImpl.hpp" #include "src/mc/mc_replay.hpp" -#include "src/surf/network_interface.hpp" #include "surf/surf.hpp" #include diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 5ecdf6a341..57ea18a285 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -3,15 +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 "simgrid/Exception.hpp" -#include "simgrid/exec.h" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "simgrid/s4u/Host.hpp" +#include +#include +#include +#include + #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_exec, s4u_activity, "S4U asynchronous executions"); diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 74b3963be9..7437ff74dd 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -3,19 +3,19 @@ /* 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/Exception.hpp" -#include "simgrid/host.h" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "simgrid/s4u/VirtualMachine.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" -#include "xbt/parse_units.hpp" -#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts"); diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp index 38050e152c..f0183d2d34 100644 --- a/src/s4u/s4u_Io.cpp +++ b/src/s4u/s4u_Io.cpp @@ -3,13 +3,13 @@ /* 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 "simgrid/s4u/Disk.hpp" -#include "simgrid/s4u/Io.hpp" +#include +#include +#include + #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "xbt/log.h" namespace simgrid { namespace s4u { diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index a9d97532e5..493d5c463a 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -3,18 +3,16 @@ /* 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 -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Link.hpp" -#include "simgrid/sg_config.hpp" -#include "simgrid/simix.hpp" #include "src/surf/SplitDuplexLinkImpl.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/network_wifi.hpp" -#include "xbt/log.h" -#include "xbt/parse_units.hpp" namespace simgrid { diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 2fcd87fe55..71e00875a7 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -3,12 +3,11 @@ /* 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 "src/kernel/activity/MailboxImpl.hpp" - #include +#include +#include + +#include "src/kernel/activity/MailboxImpl.hpp" XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes"); diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp index b4b29a4eef..c474bba12f 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.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/forward.h" -#include "simgrid/mutex.h" -#include "simgrid/s4u/Mutex.hpp" -#include "src/kernel/activity/MutexImpl.hpp" -#include "src/kernel/actor/SimcallObserver.hpp" +#include +#include +#include +#include namespace simgrid { namespace s4u { diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index a791b038c8..31df149a4b 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -4,14 +4,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/NetZone.hpp" -#include "simgrid/simix.hpp" -#include "simgrid/zone.h" +#include +#include +#include +#include +#include +#include + #include "src/surf/network_interface.hpp" -#include "xbt/parse_units.hpp" namespace simgrid { namespace s4u { diff --git a/src/s4u/s4u_Semaphore.cpp b/src/s4u/s4u_Semaphore.cpp index 56a3bf1514..0ebf33975c 100644 --- a/src/s4u/s4u_Semaphore.cpp +++ b/src/s4u/s4u_Semaphore.cpp @@ -3,11 +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 "src/msg/msg_private.hpp" -#include "xbt/log.h" +#include +#include -#include "simgrid/forward.h" -#include "simgrid/s4u/Semaphore.hpp" #include "src/kernel/activity/SemaphoreImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp"