Further cleanups in SMPI includes

private.h is not loaded by any .h/.hpp anymore. Only by .cpp files

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 47ac1b8..28437c1 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -15,7 +15,6 @@
 #include <simgrid/datatypes.h>
 #include <smpi/forward.hpp>
 #include <stddef.h>
 #include <simgrid/datatypes.h>
 #include <smpi/forward.hpp>
 #include <stddef.h>

-#include <xbt/function_types.h>

 #include <xbt/misc.h>
 
 #ifdef _WIN32
 #include <xbt/misc.h>
 
 #ifdef _WIN32

diff --git a/src/smpi/colls/colls_private.h b/src/smpi/colls/colls_private.h
index 865671c..c621957 100644 (file)
--- a/src/smpi/colls/colls_private.h
+++ b/src/smpi/colls/colls_private.h
@@ -8,6 +8,7 @@
 
 #include <math.h>
 #include "smpi/mpi.h"
 
 #include <math.h>
 #include "smpi/mpi.h"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"

diff --git a/src/smpi/smpi_coll.cpp b/src/smpi/smpi_coll.cpp
index 0bb1df0..326f462 100644 (file)
--- a/src/smpi/smpi_coll.cpp
+++ b/src/smpi/smpi_coll.cpp
@@ -6,6 +6,7 @@
 /* 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. */
 

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"

diff --git a/src/smpi/smpi_coll.hpp b/src/smpi/smpi_coll.hpp
index 6f8672c..1f5dfa4 100644 (file)
--- a/src/smpi/smpi_coll.hpp
+++ b/src/smpi/smpi_coll.hpp
@@ -8,9 +8,7 @@
 #ifndef SMPI_COLL_HPP
 #define SMPI_COLL_HPP
 
 #ifndef SMPI_COLL_HPP
 #define SMPI_COLL_HPP
 

-#include <xbt/base.h>
-
-#include "private.h"
+#include "xbt/base.h"

 
 /** \brief MPI collective description */
 
 
 /** \brief MPI collective description */
 

diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/smpi_comm.cpp
index 8bc2bef..213a822 100644 (file)
--- a/src/smpi/smpi_comm.cpp
+++ b/src/smpi/smpi_comm.cpp
@@ -6,6 +6,7 @@
 #include "simgrid/s4u/Host.hpp"
 
 #include "src/simix/smx_private.h"
 #include "simgrid/s4u/Host.hpp"
 
 #include "src/simix/smx_private.h"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_datatype.hpp"

diff --git a/src/smpi/smpi_comm.hpp b/src/smpi/smpi_comm.hpp
index 842f92c..992c922 100644 (file)
--- a/src/smpi/smpi_comm.hpp
+++ b/src/smpi/smpi_comm.hpp
@@ -6,7 +6,6 @@
 #ifndef SMPI_COMM_HPP_INCLUDED
 #define SMPI_COMM_HPP_INCLUDED
 
 #ifndef SMPI_COMM_HPP_INCLUDED
 #define SMPI_COMM_HPP_INCLUDED
 

-#include "private.h"

 #include <list>
 #include "src/smpi/smpi_keyvals.hpp"
 #include "src/smpi/smpi_group.hpp"
 #include <list>
 #include "src/smpi/smpi_keyvals.hpp"
 #include "src/smpi/smpi_group.hpp"

diff --git a/src/smpi/smpi_datatype.cpp b/src/smpi/smpi_datatype.cpp
index 6525066..49cf5a8 100644 (file)
--- a/src/smpi/smpi_datatype.cpp
+++ b/src/smpi/smpi_datatype.cpp
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/modelchecker.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/modelchecker.h"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_datatype_derived.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"
 #include "src/smpi/smpi_datatype_derived.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"

diff --git a/src/smpi/smpi_datatype_derived.hpp b/src/smpi/smpi_datatype_derived.hpp
index b104c5f..03ac756 100644 (file)
--- a/src/smpi/smpi_datatype_derived.hpp
+++ b/src/smpi/smpi_datatype_derived.hpp
@@ -7,9 +7,6 @@
 #ifndef SMPI_DATATYPE_DERIVED_HPP
 #define SMPI_DATATYPE_DERIVED_HPP
 
 #ifndef SMPI_DATATYPE_DERIVED_HPP
 #define SMPI_DATATYPE_DERIVED_HPP
 

-#include <xbt/base.h>
-
-#include "private.h"

 #include "src/smpi/smpi_datatype.hpp"
 
 namespace simgrid{
 #include "src/smpi/smpi_datatype.hpp"
 
 namespace simgrid{

diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp
index 45e87ce..475688f 100644 (file)
--- a/src/smpi/smpi_deployment.cpp
+++ b/src/smpi/smpi_deployment.cpp
@@ -5,8 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/msg.h" /* barrier */
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/msg.h" /* barrier */

-#include "src/smpi/SmpiHost.hpp"
+#include "src/smpi/private.h"

 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_comm.hpp"

+#include "src/smpi/SmpiHost.hpp"

 
 namespace simgrid {
 namespace smpi {
 
 namespace simgrid {
 namespace smpi {

diff --git a/src/smpi/smpi_f2c.cpp b/src/smpi/smpi_f2c.cpp
index 27f8fb4..978722d 100644 (file)
--- a/src/smpi/smpi_f2c.cpp
+++ b/src/smpi/smpi_f2c.cpp
@@ -3,6 +3,7 @@
 /* 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. */
 

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_f2c.hpp"
 #include "src/smpi/smpi_process.hpp"
 
 #include "src/smpi/smpi_f2c.hpp"
 #include "src/smpi/smpi_process.hpp"
 

diff --git a/src/smpi/smpi_f77.cpp b/src/smpi/smpi_f77.cpp
index d7ffc14..73d502c 100644 (file)
--- a/src/smpi/smpi_f77.cpp
+++ b/src/smpi/smpi_f77.cpp
@@ -3,6 +3,8 @@
 /* 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. */
 

+#include "src/smpi/private.h"
+#include "src/smpi/smpi_comm.hpp"

 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"

diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp
index 02e00cd..d047bcf 100644 (file)
--- a/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@ -3,41 +3,27 @@
 /* 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. */
 

-#include <dlfcn.h>
-#include <fcntl.h>
-#include <spawn.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-

 #include "mc/mc.h"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "mc/mc.h"
 #include "simgrid/s4u/Mailbox.hpp"

-#include "smpi/smpi_shared_malloc.hpp"
-#include "simgrid/sg_config.h"
-#include "src/kernel/activity/SynchroComm.hpp"
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_replay.h"
+#include "simgrid/s4u/Host.hpp"

 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"
 #include "src/surf/surf_interface.hpp"
 #include "src/smpi/SmpiHost.hpp"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"
 #include "src/surf/surf_interface.hpp"
 #include "src/smpi/SmpiHost.hpp"

-#include "surf/surf.h"
-#include "xbt/replay.hpp"
-#include <xbt/config.hpp>
-#include "src/smpi/smpi_process.hpp"
+#include "xbt/config.hpp"
+#include "src/smpi/private.h"
+#include "smpi/smpi_shared_malloc.hpp"

 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_coll.hpp"

+#include "src/smpi/smpi_comm.hpp"
+#include "src/smpi/smpi_group.hpp"

 #include "src/smpi/smpi_info.hpp"
 #include "src/smpi/smpi_info.hpp"

+#include "src/smpi/smpi_process.hpp"

 
 

+#include <dlfcn.h>
+#include <fcntl.h>
+#include <sys/stat.h>

 #include <float.h> /* DBL_MAX */
 #include <fstream>
 #include <float.h> /* DBL_MAX */
 #include <fstream>

-#include <map>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <utility>
-#include <vector>
-#include <memory>

 
 #if HAVE_SENDFILE
 #include <sys/sendfile.h>
 
 #if HAVE_SENDFILE
 #include <sys/sendfile.h>


@@ -55,9 +41,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke
 #define RTLD_DEEPBIND 0
 #endif
 
 #define RTLD_DEEPBIND 0
 #endif
 

-/* Mac OSX does not have any header file providing that definition so we have to duplicate it here. Bummers. */
-extern char** environ; /* we use it in posix_spawnp below */
-

 #if HAVE_PAPI
 #include "papi.h"
 const char* papi_default_config_name = "default";
 #if HAVE_PAPI
 #include "papi.h"
 const char* papi_default_config_name = "default";


@@ -87,8 +70,6 @@ static simgrid::config::Flag<double> smpi_init_sleep(
 
 void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback;
 
 
 void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback;
 

-
-

 int smpi_process_count()
 {
   return process_count;
 int smpi_process_count()
 {
   return process_count;

diff --git a/src/smpi/smpi_group.hpp b/src/smpi/smpi_group.hpp
index 1e8f4e5..aa01f3c 100644 (file)
--- a/src/smpi/smpi_group.hpp
+++ b/src/smpi/smpi_group.hpp
@@ -7,7 +7,6 @@
 #ifndef SMPI_GROUP_HPP_INCLUDED
 #define SMPI_GROUP_HPP_INCLUDED
 
 #ifndef SMPI_GROUP_HPP_INCLUDED
 #define SMPI_GROUP_HPP_INCLUDED
 

-#include "private.h"

 #include "src/smpi/smpi_f2c.hpp"
 
 namespace simgrid{
 #include "src/smpi/smpi_f2c.hpp"
 
 namespace simgrid{

diff --git a/src/smpi/smpi_info.cpp b/src/smpi/smpi_info.cpp
index 5a9697b..5dac6d2 100644 (file)
--- a/src/smpi/smpi_info.cpp
+++ b/src/smpi/smpi_info.cpp
@@ -5,6 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/smpi/smpi_info.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/smpi/smpi_info.hpp"

+#include "xbt/ex.hpp"
+#include "xbt/sysdep.h"

 
 namespace simgrid{
 namespace smpi{
 
 namespace simgrid{
 namespace smpi{

diff --git a/src/smpi/smpi_info.hpp b/src/smpi/smpi_info.hpp
index 25d1034..5eb096d 100644 (file)
--- a/src/smpi/smpi_info.hpp
+++ b/src/smpi/smpi_info.hpp
@@ -7,10 +7,9 @@
 #ifndef SMPI_INFO_HPP
 #define SMPI_INFO_HPP
 
 #ifndef SMPI_INFO_HPP
 #define SMPI_INFO_HPP
 

-#include <xbt/base.h>
-
-#include "private.h"
-#include "src/smpi/smpi_comm.hpp"
+#include "src/smpi/smpi_f2c.hpp"
+#include "smpi/smpi.h"
+#include "xbt/dict.h"

 
 namespace simgrid{
 namespace smpi{
 
 namespace simgrid{
 namespace smpi{

diff --git a/src/smpi/smpi_keyvals.hpp b/src/smpi/smpi_keyvals.hpp
index 46b1369..92f3384 100644 (file)
--- a/src/smpi/smpi_keyvals.hpp
+++ b/src/smpi/smpi_keyvals.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010, 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */

 
 /* 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. */


@@ -7,9 +6,10 @@
 #ifndef SMPI_KEYVALS_HPP_INCLUDED
 #define SMPI_KEYVALS_HPP_INCLUDED
 
 #ifndef SMPI_KEYVALS_HPP_INCLUDED
 #define SMPI_KEYVALS_HPP_INCLUDED
 

-#include <unordered_map>
-#include <xbt/ex.hpp>

 #include "smpi/smpi.h"
 #include "smpi/smpi.h"

+#include "xbt/ex.hpp"
+
+#include <unordered_map>

 
 typedef struct smpi_delete_fn{
   MPI_Comm_delete_attr_function          *comm_delete_fn;
 
 typedef struct smpi_delete_fn{
   MPI_Comm_delete_attr_function          *comm_delete_fn;

diff --git a/src/smpi/smpi_memory.cpp b/src/smpi/smpi_memory.cpp
index 4b29b0c..d371616 100644 (file)
--- a/src/smpi/smpi_memory.cpp
+++ b/src/smpi/smpi_memory.cpp
@@ -23,7 +23,7 @@
 
 #include "src/xbt/memory_map.hpp"
 
 
 #include "src/xbt/memory_map.hpp"
 

-#include "private.h"
+#include "src/smpi/private.h"

 #include "private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI");
 #include "private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI");

diff --git a/src/smpi/smpi_op.cpp b/src/smpi/smpi_op.cpp
index a212837..599c0c2 100644 (file)
--- a/src/smpi/smpi_op.cpp
+++ b/src/smpi/smpi_op.cpp
@@ -3,6 +3,7 @@
 /* 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. */
 

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_process.hpp"

diff --git a/src/smpi/smpi_op.hpp b/src/smpi/smpi_op.hpp
index 324227f..167a346 100644 (file)
--- a/src/smpi/smpi_op.hpp
+++ b/src/smpi/smpi_op.hpp
@@ -7,7 +7,6 @@
 #ifndef SMPI_OP_HPP
 #define SMPI_OP_HPP
 
 #ifndef SMPI_OP_HPP
 #define SMPI_OP_HPP
 

-#include "private.h"

 #include "src/smpi/smpi_info.hpp"
 
 namespace simgrid{
 #include "src/smpi/smpi_info.hpp"
 
 namespace simgrid{

diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp
index 13ea956..1d9a5f3 100644 (file)
--- a/src/smpi/smpi_pmpi.cpp
+++ b/src/smpi/smpi_pmpi.cpp
@@ -5,6 +5,7 @@
 
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_datatype_derived.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_datatype_derived.hpp"

diff --git a/src/smpi/smpi_process.cpp b/src/smpi/smpi_process.cpp
index a2f9dd2..3d989e4 100644 (file)
--- a/src/smpi/smpi_process.cpp
+++ b/src/smpi/smpi_process.cpp
@@ -7,6 +7,7 @@
 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_process.hpp"
 #include "src/smpi/smpi_group.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_process.hpp"
 #include "src/smpi/smpi_group.hpp"
 #include "src/smpi/smpi_comm.hpp"

diff --git a/src/smpi/smpi_process.hpp b/src/smpi/smpi_process.hpp
index 59a4fa1..8960249 100644 (file)
--- a/src/smpi/smpi_process.hpp
+++ b/src/smpi/smpi_process.hpp
@@ -7,10 +7,7 @@
 #ifndef SMPI_PROCESS_HPP
 #define SMPI_PROCESS_HPP
 
 #ifndef SMPI_PROCESS_HPP
 #define SMPI_PROCESS_HPP
 

-
-#include <xbt/base.h>

 #include "src/instr/instr_smpi.h"
 #include "src/instr/instr_smpi.h"

-#include "private.h"

 #include "simgrid/s4u/Mailbox.hpp"
 #include "xbt/synchro.h"
 
 #include "simgrid/s4u/Mailbox.hpp"
 #include "xbt/synchro.h"
 

diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/smpi_replay.cpp
index daf0c6f..cda83f9 100644 (file)
--- a/src/smpi/smpi_replay.cpp
+++ b/src/smpi/smpi_replay.cpp
@@ -3,6 +3,7 @@
 /* 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. */
 

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"

diff --git a/src/smpi/smpi_request.cpp b/src/smpi/smpi_request.cpp
index b0a857d..1838d94 100644 (file)
--- a/src/smpi/smpi_request.cpp
+++ b/src/smpi/smpi_request.cpp
@@ -7,6 +7,7 @@
 #include "src/mc/mc_replay.h"
 #include "src/smpi/SmpiHost.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
 #include "src/mc/mc_replay.h"
 #include "src/smpi/SmpiHost.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"
 #include "src/smpi/smpi_comm.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_op.hpp"

diff --git a/src/smpi/smpi_win.cpp b/src/smpi/smpi_win.cpp
index e20fdb4..0240e93 100644 (file)
--- a/src/smpi/smpi_win.cpp
+++ b/src/smpi/smpi_win.cpp
@@ -3,7 +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. */
 

+#include "src/smpi/private.h"

 #include "src/smpi/smpi_coll.hpp"
 #include "src/smpi/smpi_coll.hpp"

+#include "src/smpi/smpi_comm.hpp"

 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_info.hpp"
 #include "src/smpi/smpi_keyvals.hpp"
 #include "src/smpi/smpi_datatype.hpp"
 #include "src/smpi/smpi_info.hpp"
 #include "src/smpi/smpi_keyvals.hpp"