reduce the amount of header includes in headers, to speedup recompilation

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 5784e5a..017b09e 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,7 +7,7 @@
 #define MC_MC_H
 
 #include <simgrid/forward.h>
 #define MC_MC_H
 
 #include <simgrid/forward.h>

-#include <simgrid/modelchecker.h> /* our public interface (and definition of SIMGRID_HAVE_MC) */
+#include <simgrid/modelchecker.h> /* our public interface */

 
 #ifdef __cplusplus
 XBT_PUBLIC void MC_process_clock_add(const simgrid::kernel::actor::ActorImpl*, double);
 
 #ifdef __cplusplus
 XBT_PUBLIC void MC_process_clock_add(const simgrid::kernel::actor::ActorImpl*, double);

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 8601126..d270c4f 100644 (file)
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -5,17 +5,11 @@
 
 #include <simgrid/Exception.hpp>
 #include <simgrid/kernel/routing/NetPoint.hpp>
 
 #include <simgrid/Exception.hpp>
 #include <simgrid/kernel/routing/NetPoint.hpp>

-#include <simgrid/s4u/Engine.hpp>
-#include <simgrid/s4u/Host.hpp>

 
 

-#include "mc/mc.h"

 #include "src/kernel/activity/IoImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/activity/IoImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"

-#include "src/kernel/actor/SimcallObserver.hpp"
-#include "src/kernel/resource/CpuImpl.hpp"

 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/kernel/resource/HostImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/kernel/resource/HostImpl.hpp"

-#include "src/mc/mc_replay.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_io, kernel, "Kernel io-related synchronization");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_io, kernel, "Kernel io-related synchronization");
 

diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp
index 4a637c1..fb84db7 100644 (file)
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@ -6,13 +6,13 @@
 #ifndef SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
 #define SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
 
 #ifndef SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
 #define SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
 

-#include <boost/circular_buffer.hpp>
-

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 

+#include <boost/circular_buffer.hpp>
+

 namespace simgrid::kernel::activity {
 
 /** @brief Implementation of the s4u::Mailbox */
 namespace simgrid::kernel::activity {
 
 /** @brief Implementation of the s4u::Mailbox */

diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp
index 5269078..fb69aad 100644 (file)
--- a/src/kernel/activity/SemaphoreImpl.hpp
+++ b/src/kernel/activity/SemaphoreImpl.hpp
@@ -6,13 +6,13 @@
 #ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 #define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 
 #ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 #define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 

-#include <atomic>
-#include <boost/intrusive/list.hpp>
-

 #include "simgrid/s4u/Semaphore.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SynchroObserver.hpp"
 
 #include "simgrid/s4u/Semaphore.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SynchroObserver.hpp"
 

+#include <atomic>
+#include <boost/intrusive/list.hpp>
+

 namespace simgrid::kernel::activity {
 
 /** Semaphore Acquisition: the act / process of acquiring the semaphore.
 namespace simgrid::kernel::activity {
 
 /** Semaphore Acquisition: the act / process of acquiring the semaphore.

diff --git a/src/kernel/lmm/System.hpp b/src/kernel/lmm/System.hpp
index d83ae01..e719693 100644 (file)
--- a/src/kernel/lmm/System.hpp
+++ b/src/kernel/lmm/System.hpp
@@ -8,9 +8,7 @@
 
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
 
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"

-#include "simgrid/s4u/Link.hpp"

 #include "xbt/asserts.h"
 #include "xbt/asserts.h"

-#include "xbt/ex.h"

 #include "xbt/mallocator.h"
 
 #include <boost/intrusive/list.hpp>
 #include "xbt/mallocator.h"
 
 #include <boost/intrusive/list.hpp>

diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 3bae152..b1f78cf 100644 (file)
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -5,6 +5,7 @@
 
 #include "src/kernel/lmm/maxmin.hpp"
 #include "simgrid/math_utils.h"
 
 #include "src/kernel/lmm/maxmin.hpp"
 #include "simgrid/math_utils.h"

+#include "xbt/ex.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_lmm);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_lmm);
 

diff --git a/src/kernel/resource/CpuImpl.hpp b/src/kernel/resource/CpuImpl.hpp
index 3456bfa..0a80841 100644 (file)
--- a/src/kernel/resource/CpuImpl.hpp
+++ b/src/kernel/resource/CpuImpl.hpp
@@ -10,6 +10,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/kernel/resource/Resource.hpp"

+#include "xbt/ex.h"

 
 #include <list>
 
 
 #include <list>
 

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 352fac5..55f6857 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -3,6 +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. */
 
 /* 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. */
 

+#ifndef DISK_IMPL_HPP_
+#define DISK_IMPL_HPP_
+

 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
 #include "simgrid/s4u/Disk.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
 #include "simgrid/s4u/Disk.hpp"


@@ -12,13 +15,6 @@
 
 #include <map>
 
 
 #include <map>
 

-#ifndef DISK_IMPL_HPP_
-#define DISK_IMPL_HPP_
-
-/*********
- * Model *
- *********/
-

 namespace simgrid::kernel::resource {
 /***********
  * Classes *
 namespace simgrid::kernel::resource {
 /***********
  * Classes *

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index 4df935e..6006754 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -5,6 +5,7 @@
 
 #include "simgrid/kernel/resource/Model.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 
 #include "simgrid/kernel/resource/Model.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

+#include "xbt/ex.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_resource);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_resource);
 

diff --git a/src/kernel/resource/WifiLinkImpl.hpp b/src/kernel/resource/WifiLinkImpl.hpp
index 34810ca..95d82e9 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.hpp
+++ b/src/kernel/resource/WifiLinkImpl.hpp
@@ -7,6 +7,7 @@
 #define SURF_NETWORK_WIFI_HPP_
 
 #include "src/kernel/resource/models/network_cm02.hpp"
 #define SURF_NETWORK_WIFI_HPP_
 
 #include "src/kernel/resource/models/network_cm02.hpp"

+#include "xbt/ex.h"

 
 /***********
  * Classes *
 
 /***********
  * Classes *

diff --git a/src/kernel/resource/models/cpu_cas01.hpp b/src/kernel/resource/models/cpu_cas01.hpp
index 9202372..a5e7782 100644 (file)
--- a/src/kernel/resource/models/cpu_cas01.hpp
+++ b/src/kernel/resource/models/cpu_cas01.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_SURF_CPUCAS01_HPP
 
 #include "src/kernel/resource/CpuImpl.hpp"
 #define SIMGRID_SURF_CPUCAS01_HPP
 
 #include "src/kernel/resource/CpuImpl.hpp"

-#include "xbt/base.h"

 
 namespace simgrid::kernel::resource {
 
 
 namespace simgrid::kernel::resource {
 

diff --git a/src/kernel/resource/models/cpu_ti.hpp b/src/kernel/resource/models/cpu_ti.hpp
index ce132c5..cf63536 100644 (file)
--- a/src/kernel/resource/models/cpu_ti.hpp
+++ b/src/kernel/resource/models/cpu_ti.hpp
@@ -8,6 +8,8 @@
 
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
 
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"

+#include "xbt/ex.h"
+

 #include <boost/intrusive/list.hpp>
 #include <memory>
 
 #include <boost/intrusive/list.hpp>
 #include <memory>
 

diff --git a/src/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h
index 156e3c7..2345203 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -14,12 +14,12 @@
 
 #include "mc/datatypes.h"
 #include "simgrid/forward.h" // aid_t
 
 #include "mc/datatypes.h"
 #include "simgrid/forward.h" // aid_t

-#include <array>
-#include <cstdint>
-#include <xbt/dynar.h>

 #include <xbt/mmalloc.h>
 #include <xbt/utility.hpp>
 
 #include <xbt/mmalloc.h>
 #include <xbt/utility.hpp>
 

+#include <array>
+#include <cstdint>
+

 // ***** Messages
 namespace simgrid::mc {
 
 // ***** Messages
 namespace simgrid::mc {