From a0c9b58a87e5d73f51f6c9f40d8c7038d860f98b Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Aug 2018 11:25:29 +0200
Subject: [PATCH] Please people, stop including internal_config.h in generic
 header files

Every file including src/internal_config.h (directly or indirectly)
must be rebuilt when the cmake file or config are changed. I change
these file *a lot* during my refactorings, and I get tired of
recompiling large amount of files that were not affected in any way.

This time, all of SMPI was recompiled each time. Including the **many**
collectives that we integrated a long time ago and never changed since
then. These files are not build-configured in anyway, so please don't
make me recompiling them again and again, please.
---
 src/instr/instr_private.hpp  | 1 -
 src/smpi/include/private.hpp | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index bf594db9ce..f31fd92d8c 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -14,7 +14,6 @@
 #include "src/instr/instr_paje_events.hpp"
 #include "src/instr/instr_paje_types.hpp"
 #include "src/instr/instr_paje_values.hpp"
-#include "src/internal_config.h"
 #include "xbt/graph.h"
 
 #include <fstream>
diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index d650bf8700..7c591b777e 100644
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -10,7 +10,6 @@
 #include "smpi/smpi.h"
 #include "smpi/smpi_helpers_internal.h"
 #include "src/instr/instr_smpi.hpp"
-#include "src/internal_config.h"
 #include <unordered_map>
 #include <vector>
 
@@ -425,14 +424,13 @@ XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process(
  */
 #define TOPAGE(addr) (void*)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize)
 
-#if HAVE_PAPI
+/** Used only if PAPI is compiled in, but integrated anyway so that this file does not depend on internal_config.h (to speed builds) */
 typedef std::vector<std::pair</* counter name */ std::string, /* counter value */ long long>> papi_counter_t;
 struct papi_process_data {
   papi_counter_t counter_data;
   int event_set;
 };
 extern std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
-#endif
 
 extern std::unordered_map<std::string, double> location2speedup;
 
-- 
2.20.1