[mc] Fix #includes

diff --git a/src/mc/Client.cpp b/src/mc/Client.cpp
index fbbbe92..5503344 100644 (file)
--- a/src/mc/Client.cpp
+++ b/src/mc/Client.cpp
@@ -14,6 +14,7 @@
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 #include <xbt/mmalloc.h>
+#include <xbt/swag.h>
 
 #include "src/internal_config.h"
 

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/LivenessChecker.hpp
index 18c32a0..7ce79ce 100644 (file)
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/LivenessChecker.hpp
@@ -16,7 +16,6 @@
 
 #include <simgrid_config.h>
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 #include <xbt/automaton.h>
 #include <xbt/memory.hpp>
 #include "src/mc/mc_state.h"

diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 4399f82..88c9175 100644 (file)
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -12,9 +12,6 @@
 
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
-#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
-#include <xbt/fifo.h>
 
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_safety.h"

diff --git a/src/mc/malloc.hpp b/src/mc/malloc.hpp
index 0447cc4..b07d3ed 100644 (file)
--- a/src/mc/malloc.hpp
+++ b/src/mc/malloc.hpp
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include <xbt/mmalloc.h>
+#include <xbt/dynar.h>
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/Process.hpp"

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index d3fdc26..8a0418f 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -6,6 +6,7 @@
 
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
+#include <xbt/automaton.h>
 #include <simgrid/modelchecker.h>
 
 #include "src/mc/mc_record.h"

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index fb5c0d3..fb56120 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -16,6 +16,8 @@
 #include "src/mc/mc_dwarf.hpp"
 #include "src/mc/Type.hpp"
 
+#include <xbt/dynar.h>
+
 using simgrid::mc::remote;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt,

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 079c2aa..2f9f7e2 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -13,6 +13,10 @@
 
 #include <vector>
 
+#include <xbt/dynar.h>
+#include <xbt/automaton.h>
+#include <xbt/swag.h>
+
 #include "mc_base.h"
 
 #include "mc/mc.h"

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 99da4d5..ceaf9c1 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -19,7 +19,6 @@
 #include <elfutils/libdw.h>
 
 #include <simgrid/msg.h>
-#include <xbt/fifo.h>
 #include <xbt/config.h>
 #include <xbt/base.h>
 #include <xbt/automaton.h>

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index a2f6ce4..a504372 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -12,7 +12,6 @@
 #include <sstream>
 #include <string>
 
-#include <xbt/fifo.h>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 

diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index dbe0e86..db7636f 100644 (file)
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -21,7 +21,6 @@
 #include <vector>
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index 121ce91..4ce0812 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -10,6 +10,7 @@
 #include <xbt/str.h>
 #include <xbt/sysdep.h>
 #include <xbt/dynar.h>
+#include <xbt/swag.h>
 
 #include "src/mc/mc_request.h"
 #include "src/mc/mc_safety.h"

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index b1cd987..23fbe10 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -15,7 +15,6 @@
 #include <simgrid_config.h>
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_state.h"

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 6913890..b904885 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -40,10 +40,10 @@ simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
   return process_info;
 }
 
-/** Load the remote swag of processes into a dynar
+/** Load the remote swag of processes into a vector
  *
  *  @param process     MCed process
- *  @param target      Local dynar (to be filled with copies of `s_smx_process_t`)
+ *  @param target      Local vector (to be filled with copies of `s_smx_process_t`)
  *  @param remote_swag Address of the process SWAG in the remote list
  */
 static void MC_process_refresh_simix_process_list(
@@ -56,7 +56,7 @@ static void MC_process_refresh_simix_process_list(
   s_xbt_swag_t swag;
   process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
 
-  // Load each element of the dynar from the MCed process:
+  // Load each element of the vector from the MCed process:
   int i = 0;
   for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {