tidy some #includes in MC

diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp
index c9249a0..c59369b 100644 (file)
--- a/src/mc/ObjectInformation.hpp
+++ b/src/mc/ObjectInformation.hpp
@@ -12,12 +12,10 @@
 #include <memory>
 #include <vector>
 
-#include "xbt/base.h"
-
-#include "src/xbt/memory_map.hpp"
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/Type.hpp"
 #include "src/mc/Frame.hpp"
+#include "src/mc/Type.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/xbt/memory_map.hpp"
 
 #include "src/smpi/include/private.hpp"
 

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 5394fbe..e8c0ca8 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -4,29 +4,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 <exception>
-
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-#include <utility>
-
-#include <unistd.h>
-
-#include <xbt/log.h>
-
 #include "simgrid/sg_config.hpp"
-#include "src/xbt_modinter.h"
-
-#include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_comm_pattern.hpp"
 #include "src/mc/mc_exit.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_safety.hpp"
-#include "src/mc/remote/mc_protocol.h"
+
+#include <cstring>
+#include <memory>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 

diff --git a/src/mc/mc_unw.hpp b/src/mc/mc_unw.hpp
index 4c302c8..466b3df 100644 (file)
--- a/src/mc/mc_unw.hpp
+++ b/src/mc/mc_unw.hpp
@@ -30,7 +30,6 @@
 
 #include <cstdio>
 #include <libunwind.h>
-#include <sys/types.h>
 
 namespace simgrid {
 namespace unw {

diff --git a/src/mc/remote/Channel.cpp b/src/mc/remote/Channel.cpp
index 7594e5e..3a0c4eb 100644 (file)
--- a/src/mc/remote/Channel.cpp
+++ b/src/mc/remote/Channel.cpp
@@ -4,16 +4,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/mc/remote/Channel.hpp"
+#include <xbt/log.h>
+
 #include <cerrno>
 #include <unistd.h>
-
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <xbt/log.h>
-
-#include "src/mc/remote/Channel.hpp"
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Channel, mc, "MC interprocess communication");
 
 namespace simgrid {

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index ada56e0..ffbbfae 100644 (file)
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -3,28 +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/mc/remote/Client.hpp"
+#include "src/internal_config.h"
+#include <simgrid/modelchecker.h>
+
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-
 #include <sys/ptrace.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <xbt/log.h>
-#include <xbt/mmalloc.h>
-#include <xbt/sysdep.h>
-
-#include <simgrid/modelchecker.h>
-
-#include "src/internal_config.h"
-
-#include "src/mc/mc_request.hpp"
-#include "src/mc/remote/Client.hpp"
-#include "src/mc/remote/mc_protocol.h"
-
-#include "src/smpi/include/private.hpp"
-
 // We won't need those once the separation MCer/MCed is complete:
 #include "src/mc/mc_smx.hpp"
 

diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp
index 28721c0..6d239f2 100644 (file)
--- a/src/mc/remote/RemoteClient.cpp
+++ b/src/mc/remote/RemoteClient.cpp
@@ -3,45 +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. */
 
-#define _FILE_OFFSET_BITS 64 /* needed for pread_whole to work as expected on 32bits */
-
-#include <algorithm>
-#include <cassert>
-#include <cerrno>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include <sys/ptrace.h>
-
-#include <cstdio>
-
-#include <fcntl.h>
-#include <sys/mman.h> // PROT_*
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <pthread.h>
-
-#include <libgen.h>
-
-#include <libunwind-ptrace.h>
-#include <libunwind.h>
+#include "src/mc/remote/RemoteClient.hpp"
 
-#include "xbt/base.h"
 #include "xbt/file.hpp"
 #include "xbt/log.h"
-#include <xbt/mmalloc.h>
-
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/mc_unw.hpp"
 #include "src/mc/sosp/mc_snapshot.hpp"
 
-#include "src/mc/AddressSpace.hpp"
-#include "src/mc/ObjectInformation.hpp"
-#include "src/mc/Variable.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#define _FILE_OFFSET_BITS 64 /* needed for pread_whole to work as expected on 32bits */
+
+#include <fcntl.h>
+#include <libunwind-ptrace.h>
+#include <sys/mman.h> // PROT_*
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/remote/mc_protocol.cpp b/src/mc/remote/mc_protocol.cpp
index 7aed216..f014ece 100644 (file)
--- a/src/mc/remote/mc_protocol.cpp
+++ b/src/mc/remote/mc_protocol.cpp
@@ -4,21 +4,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. */
 
-#include <cerrno>
-#include <cstddef> // std::size_t
-#include <cstdio>  // perror
-#include <cstring>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-
-#include <xbt/log.h>
-
-#include "src/mc/remote/Client.hpp"
 #include "src/mc/remote/mc_protocol.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_protocol, mc, "Generic MC protocol logic");
-
 const char* MC_message_type_name(e_mc_message_type type)
 {
   switch (type) {