convert src/mc/mc_replay.h into mc_replay.hpp (+ don't use C linkage on C++ datatypes)

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index c7517bf..7f19e42 100644 (file)
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -6,7 +6,7 @@
 #include "src/kernel/activity/CommImpl.hpp"
 
 #include "simgrid/modelchecker.h"
 #include "src/kernel/activity/CommImpl.hpp"
 
 #include "simgrid/modelchecker.h"

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

 #include "src/simix/smx_network_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 #include "src/simix/smx_network_private.hpp"
 #include "src/surf/surf_interface.hpp"
 

diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
index 75e4cc2..cf35963 100644 (file)
--- a/src/mc/checker/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2011-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2011-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. */


@@ -27,7 +26,7 @@
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_record.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_record.hpp"

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

 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_smx.hpp"
 #include "src/mc/remote/Client.hpp"
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_smx.hpp"
 #include "src/mc/remote/Client.hpp"

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index eebd47b..ad06017 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -7,7 +7,7 @@
 
 #include "mc/mc.h"
 #include "src/mc/mc_base.h"
 
 #include "mc/mc.h"
 #include "src/mc/mc_base.h"

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

 #include "src/simix/smx_private.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/simix/smx_private.hpp"
 
 #if SIMGRID_HAVE_MC

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index d783988..bfee449 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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. */


@@ -8,8 +7,8 @@
 #include "xbt/log.h"
 #include <xbt/sysdep.h>
 
 #include "xbt/log.h"
 #include <xbt/sysdep.h>
 

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

 #include <mc/mc.h>
 #include <mc/mc.h>

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

 
 #include <simgrid/sg_config.h>
 
 
 #include <simgrid/sg_config.h>
 

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index b0011bd..5018b25 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-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. */


@@ -19,7 +18,7 @@
 
 #include "src/kernel/context/Context.hpp"
 #include "src/mc/mc_record.hpp"
 
 #include "src/kernel/context/Context.hpp"
 #include "src/mc/mc_record.hpp"

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

 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"
 
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"
 


@@ -37,9 +36,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
   " Logging specific to MC record/replay facility");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
   " Logging specific to MC record/replay facility");
 

-extern "C" {

 std::string MC_record_path;
 std::string MC_record_path;

-}

 
 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_replay.h b/src/mc/mc_replay.hpp
similarity index 87%
rename from src/mc/mc_replay.h
rename to src/mc/mc_replay.hpp
index 273c92c..c4c2dd8 100644 (file)
--- a/src/mc/mc_replay.h
+++ b/src/mc/mc_replay.hpp
@@ -9,8 +9,6 @@
 #include "xbt/base.h"
 #include <string>
 
 #include "xbt/base.h"
 #include <string>
 

-SG_BEGIN_DECL()
-

 /** Replay path (if any) in string representation
  *
  *  This is using the format generated by traceToString().
 /** Replay path (if any) in string representation
  *
  *  This is using the format generated by traceToString().


@@ -18,10 +16,9 @@ SG_BEGIN_DECL()
 XBT_PUBLIC_DATA(std::string) MC_record_path;
 
 /** Whether the replay mode is enabled */
 XBT_PUBLIC_DATA(std::string) MC_record_path;
 
 /** Whether the replay mode is enabled */

-static inline int MC_record_replay_is_active() {
+static inline int MC_record_replay_is_active()
+{

   return not MC_record_path.empty();
 }
 
   return not MC_record_path.empty();
 }
 

-SG_END_DECL()
-

 #endif
 #endif

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 9158528..281feaa 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -1,10 +1,9 @@
-/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-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. */
 

-/* sg_config: configuration infrastructure for the simulation world       */
+/* sg_config: configuration infrastructure for the simulation world         */

 
 #include "simgrid/sg_config.h"
 #include "instr/instr_interface.h"
 
 #include "simgrid/sg_config.h"
 #include "instr/instr_interface.h"


@@ -12,7 +11,7 @@
 #include "simgrid/instr.h"
 #include "simgrid/simix.h"
 #include "simgrid_config.h" /* what was compiled in? */
 #include "simgrid/instr.h"
 #include "simgrid/simix.h"
 #include "simgrid_config.h" /* what was compiled in? */

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

 #include "src/surf/surf_interface.hpp"
 #include "surf/maxmin.hpp"
 #include "surf/surf.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/maxmin.hpp"
 #include "surf/surf.hpp"

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index f3fa15e..ed204c9 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -24,7 +24,7 @@
 #include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"

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

 #include "src/mc/remote/Client.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/mc/remote/Client.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/surf/cpu_interface.hpp"

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 6ba3e71..568bce1 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -5,8 +5,7 @@
 /*                                                                            */
 /* This is somehow the "libc" of SimGrid                                      */
 
 /*                                                                            */
 /* This is somehow the "libc" of SimGrid                                      */
 

-/* Copyright (c) 2010-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. */


@@ -22,7 +21,7 @@
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_forward.hpp"

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

 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/simix/smx_host_private.hpp"
 #include "xbt/ex.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/simix/smx_host_private.hpp"
 #include "xbt/ex.h"

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 6452ba7..6e770e8 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -23,7 +23,7 @@
 
 #include "mc/mc.h"
 #include "simgrid/sg_config.h"
 
 #include "mc/mc.h"
 #include "simgrid/sg_config.h"

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

 #include "src/surf/StorageImpl.hpp"
 
 #include "src/smpi/include/smpi_process.hpp"
 #include "src/surf/StorageImpl.hpp"
 
 #include "src/smpi/include/smpi_process.hpp"

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 6565a4a..393256f 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -6,7 +6,7 @@
 #include "mc/mc.h"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "mc/mc.h"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"

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

 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/ex.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/ex.hpp"

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index ea85a58..30bd46e 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -15,7 +15,7 @@
 #include "mc/mc.h"
 #include "simgrid/s4u/Activity.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "mc/mc.h"
 #include "simgrid/s4u/Activity.hpp"
 #include "simgrid/s4u/Mailbox.hpp"

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

 #include "src/simix/smx_private.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_private.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"

diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 7f8dd61..aefe6b7 100644 (file)
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -8,7 +8,7 @@
 #include "smpi_comm.hpp"
 #include "smpi_process.hpp"
 #include "src/internal_config.h"
 #include "smpi_comm.hpp"
 #include "smpi_process.hpp"
 #include "src/internal_config.h"

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

 #include <unordered_map>
 
 #ifndef WIN32
 #include <unordered_map>
 
 #ifndef WIN32

diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp
index bb4f482..b6c4d10 100644 (file)
--- a/src/smpi/internals/smpi_process.cpp
+++ b/src/smpi/internals/smpi_process.cpp
@@ -8,7 +8,7 @@
 #include "private.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_group.hpp"
 #include "private.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_group.hpp"

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

 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"
 
 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"
 

diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index 0ed24fa..64c3574 100644 (file)
--- a/src/smpi/mpi/smpi_request.cpp
+++ b/src/smpi/mpi/smpi_request.cpp
@@ -5,15 +5,15 @@
 
 #include "smpi_request.hpp"
 
 
 #include "smpi_request.hpp"
 

-#include "mc/mc.h"
-#include "src/kernel/activity/CommImpl.hpp"
-#include "src/mc/mc_replay.h"

 #include "SmpiHost.hpp"
 #include "SmpiHost.hpp"

+#include "mc/mc.h"

 #include "private.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_datatype.hpp"
 #include "smpi_op.hpp"
 #include "smpi_process.hpp"
 #include "private.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_datatype.hpp"
 #include "smpi_op.hpp"
 #include "smpi_process.hpp"

+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/mc/mc_replay.hpp"

 
 #include <algorithm>
 
 
 #include <algorithm>