move the synchronization stuff to its own directory

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 7c350f7..01eee91 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -20,12 +20,12 @@
 #include "mc/mc.h"
 #include "src/mc/mc_protocol.h"
 
 #include "mc/mc.h"
 #include "src/mc/mc_protocol.h"
 

-#include "src/simix/Synchro.h"
-#include "src/simix/SynchroIo.hpp"
-#include "src/simix/SynchroComm.hpp"
-#include "src/simix/SynchroRaw.hpp"
-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroExec.hpp"
+#include "src/synchro/Synchro.h"
+#include "src/synchro/SynchroIo.hpp"
+#include "src/synchro/SynchroComm.hpp"
+#include "src/synchro/SynchroRaw.hpp"
+#include "src/synchro/SynchroSleep.hpp"
+#include "src/synchro/SynchroExec.hpp"

 
 #if HAVE_MC
 #include "src/mc/mc_request.h"
 
 #if HAVE_MC
 #include "src/mc/mc_request.h"

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 1bca3ac..817cbdb 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -21,8 +21,8 @@
 #include "xbt/config.h"
 #include "src/instr/instr_private.h"
 
 #include "xbt/config.h"
 #include "src/instr/instr_private.h"
 

-#include "src/simix/SynchroExec.hpp"
-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroExec.hpp"
+#include "src/synchro/SynchroComm.hpp"

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 8cf08c4..7ecda54 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -25,7 +25,7 @@
 #include "xbt/ex.h"
 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"
 #include "xbt/ex.h"
 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"

-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroComm.hpp"

 
 #include <simgrid/simix.hpp>
 
 
 #include <simgrid/simix.hpp>
 


@@ -1119,4 +1119,4 @@ void unblock(smx_process_t process)
 }
 
 }
 }
 
 }

-}
\ No newline at end of file
+}

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 70a30d2..1e59de2 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -11,11 +11,11 @@
 #include "src/mc/mc_private.h"
 #endif
 
 #include "src/mc/mc_private.h"
 #endif
 

-#include "src/simix/SynchroExec.hpp"
-#include "src/simix/SynchroComm.hpp"
-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroRaw.hpp"
-#include "src/simix/SynchroIo.hpp"
+#include "src/synchro/SynchroExec.hpp"
+#include "src/synchro/SynchroComm.hpp"
+#include "src/synchro/SynchroSleep.hpp"
+#include "src/synchro/SynchroRaw.hpp"
+#include "src/synchro/SynchroIo.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
                                 "Popping part of SIMIX (transmuting from user request into kernel handlers)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
                                 "Popping part of SIMIX (transmuting from user request into kernel handlers)");

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index a995c45..d63e2cb 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -25,11 +25,11 @@
 #include "src/mc/mc_replay.h"
 #include "simgrid/sg_config.h"
 
 #include "src/mc/mc_replay.h"
 #include "simgrid/sg_config.h"
 

-#include "src/simix/SynchroExec.hpp"
-#include "src/simix/SynchroComm.hpp"
-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroIo.hpp"
-#include "src/simix/SynchroRaw.hpp"
+#include "src/synchro/SynchroExec.hpp"
+#include "src/synchro/SynchroComm.hpp"
+#include "src/synchro/SynchroSleep.hpp"
+#include "src/synchro/SynchroIo.hpp"
+#include "src/synchro/SynchroRaw.hpp"

 
 #if HAVE_MC
 #include "src/mc/mc_private.h"
 
 #if HAVE_MC
 #include "src/mc/mc_private.h"

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index ad9ac26..cf5a4c1 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -12,8 +12,8 @@
 #include "src/surf/virtual_machine.hpp"
 #include "src/surf/HostImpl.hpp"
 
 #include "src/surf/virtual_machine.hpp"
 #include "src/surf/HostImpl.hpp"
 

-#include "src/simix/SynchroExec.hpp"
-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroExec.hpp"
+#include "src/synchro/SynchroComm.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
 

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index bac4f9f..7088c8e 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -14,7 +14,7 @@
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
 #include "simgrid/simix.h"
 #include "popping_private.h"
 

-#include "src/simix/SynchroExec.hpp"
+#include "src/synchro/SynchroExec.hpp"

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index ee869cc..8b2818c 100644 (file)
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -16,7 +16,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
 
 #include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
 

-#include "src/simix/SynchroIo.hpp"
+#include "src/synchro/SynchroIo.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index 25783eb..f35e701 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -19,7 +19,7 @@
 #include "xbt/dict.h"
 #include "simgrid/s4u/mailbox.hpp"
 
 #include "xbt/dict.h"
 #include "simgrid/s4u/mailbox.hpp"
 

-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroComm.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
 

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 605faaa..6c03b4b 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -26,9 +26,9 @@
 #include "src/mc/mc_replay.h"
 #include "src/mc/Client.hpp"
 #include "src/msg/msg_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/mc/Client.hpp"
 #include "src/msg/msg_private.h"

-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroRaw.hpp"
-#include "src/simix/SynchroIo.hpp"
+#include "src/synchro/SynchroSleep.hpp"
+#include "src/synchro/SynchroRaw.hpp"
+#include "src/synchro/SynchroIo.hpp"

 
 #ifdef HAVE_SMPI
 #include "src/smpi/private.h"
 
 #ifdef HAVE_SMPI
 #include "src/smpi/private.h"

diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp
index b4fd81c..8305150 100644 (file)
--- a/src/simix/smx_synchro.cpp
+++ b/src/simix/smx_synchro.cpp
@@ -10,7 +10,7 @@
 #include <xbt/ex.hpp>
 #include <xbt/log.h>
 
 #include <xbt/ex.hpp>
 #include <xbt/log.h>
 

-#include "src/simix/SynchroRaw.hpp"
+#include "src/synchro/SynchroRaw.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
                                 "SIMIX Synchronization (mutex, semaphores and conditions)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
                                 "SIMIX Synchronization (mutex, semaphores and conditions)");

diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp
index d60b2bf..effd3eb 100644 (file)
--- a/src/smpi/smpi_base.cpp
+++ b/src/smpi/smpi_base.cpp
@@ -19,7 +19,7 @@
 #include "simgrid/sg_config.h"
 #include "colls/colls.h"
 
 #include "simgrid/sg_config.h"
 #include "colls/colls.h"
 

-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroComm.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)");
 

diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp
index 595b879..5103d03 100644 (file)
--- a/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@ -15,7 +15,7 @@
 #include "simgrid/sg_config.h"
 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"
 #include "simgrid/sg_config.h"
 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"

-#include "src/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroComm.hpp"

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

diff --git a/src/simix/Synchro.cpp b/src/synchro/Synchro.cpp
similarity index 94%
rename from src/simix/Synchro.cpp
rename to src/synchro/Synchro.cpp
index e64a060..92be33d 100644 (file)
--- a/src/simix/Synchro.cpp
+++ b/src/synchro/Synchro.cpp
@@ -3,7 +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/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 simgrid::simix::Synchro::Synchro()
 {
 
 simgrid::simix::Synchro::Synchro()
 {

diff --git a/src/simix/Synchro.h b/src/synchro/Synchro.h
similarity index 100%
rename from src/simix/Synchro.h
rename to src/synchro/Synchro.h

diff --git a/src/simix/SynchroComm.cpp b/src/synchro/SynchroComm.cpp
similarity index 98%
rename from src/simix/SynchroComm.cpp
rename to src/synchro/SynchroComm.cpp
index e97b18f..283e925 100644 (file)
--- a/src/simix/SynchroComm.cpp
+++ b/src/synchro/SynchroComm.cpp
@@ -3,7 +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/simix/SynchroComm.hpp"
+#include "src/synchro/SynchroComm.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_network_private.h"
 #include "simgrid/modelchecker.h"
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_network_private.h"
 #include "simgrid/modelchecker.h"

diff --git a/src/simix/SynchroComm.hpp b/src/synchro/SynchroComm.hpp
similarity index 98%
rename from src/simix/SynchroComm.hpp
rename to src/synchro/SynchroComm.hpp
index 02c427d..eb88c49 100644 (file)
--- a/src/simix/SynchroComm.hpp
+++ b/src/synchro/SynchroComm.hpp
@@ -7,7 +7,7 @@
 #define _SIMIX_SYNCHRO_COMM_HPP
 
 #include "surf/surf.h"
 #define _SIMIX_SYNCHRO_COMM_HPP
 
 #include "surf/surf.h"

-#include "src/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 typedef enum {
   SIMIX_COMM_SEND,
 
 typedef enum {
   SIMIX_COMM_SEND,

diff --git a/src/simix/SynchroExec.cpp b/src/synchro/SynchroExec.cpp
similarity index 97%
rename from src/simix/SynchroExec.cpp
rename to src/synchro/SynchroExec.cpp
index 9f08b4b..5fad86a 100644 (file)
--- a/src/simix/SynchroExec.cpp
+++ b/src/synchro/SynchroExec.cpp
@@ -5,7 +5,7 @@
 
 #include <simgrid/s4u/host.hpp>
 
 
 #include <simgrid/s4u/host.hpp>
 

-#include "src/simix/SynchroExec.hpp"
+#include "src/synchro/SynchroExec.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_host_private.h"
 
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_host_private.h"
 

diff --git a/src/simix/SynchroExec.hpp b/src/synchro/SynchroExec.hpp
similarity index 96%
rename from src/simix/SynchroExec.hpp
rename to src/synchro/SynchroExec.hpp
index b9e31aa..232ff6a 100644 (file)
--- a/src/simix/SynchroExec.hpp
+++ b/src/synchro/SynchroExec.hpp
@@ -7,7 +7,7 @@
 #define _SIMIX_SYNCHRO_EXEC_HPP
 
 #include "surf/surf.h"
 #define _SIMIX_SYNCHRO_EXEC_HPP
 
 #include "surf/surf.h"

-#include "src/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 namespace simgrid {
 namespace simix {
 
 namespace simgrid {
 namespace simix {

diff --git a/src/simix/SynchroIo.cpp b/src/synchro/SynchroIo.cpp
similarity index 97%
rename from src/simix/SynchroIo.cpp
rename to src/synchro/SynchroIo.cpp
index 812bbaf..4c77129 100644 (file)
--- a/src/simix/SynchroIo.cpp
+++ b/src/synchro/SynchroIo.cpp
@@ -3,7 +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/simix/SynchroIo.hpp"
+#include "src/synchro/SynchroIo.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/simix/popping_private.h"
 #include "src/simix/smx_private.h"
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/popping_private.h"
 #include "src/simix/smx_private.h"

diff --git a/src/simix/SynchroIo.hpp b/src/synchro/SynchroIo.hpp
similarity index 94%
rename from src/simix/SynchroIo.hpp
rename to src/synchro/SynchroIo.hpp
index 0927c0b..202b635 100644 (file)
--- a/src/simix/SynchroIo.hpp
+++ b/src/synchro/SynchroIo.hpp
@@ -7,7 +7,7 @@
 #define _SIMIX_SYNCHRO_IO_HPP
 
 #include "surf/surf.h"
 #define _SIMIX_SYNCHRO_IO_HPP
 
 #include "surf/surf.h"

-#include "src/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 namespace simgrid {
 namespace simix {
 
 namespace simgrid {
 namespace simix {

diff --git a/src/simix/SynchroRaw.cpp b/src/synchro/SynchroRaw.cpp
similarity index 96%
rename from src/simix/SynchroRaw.cpp
rename to src/synchro/SynchroRaw.cpp
index 3bb881d..02e37db 100644 (file)
--- a/src/simix/SynchroRaw.cpp
+++ b/src/synchro/SynchroRaw.cpp
@@ -3,7 +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/simix/SynchroRaw.hpp"
+#include "src/synchro/SynchroRaw.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_synchro_private.h"
 
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_synchro_private.h"
 

diff --git a/src/simix/SynchroRaw.hpp b/src/synchro/SynchroRaw.hpp
similarity index 95%
rename from src/simix/SynchroRaw.hpp
rename to src/synchro/SynchroRaw.hpp
index 1d9345b..d2ff889 100644 (file)
--- a/src/simix/SynchroRaw.hpp
+++ b/src/synchro/SynchroRaw.hpp
@@ -7,7 +7,7 @@
 #define _SIMIX_SYNCHRO_RAW_HPP
 
 #include "surf/surf.h"
 #define _SIMIX_SYNCHRO_RAW_HPP
 
 #include "surf/surf.h"

-#include "src/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 namespace simgrid {
 namespace simix {
 
 namespace simgrid {
 namespace simix {

diff --git a/src/simix/SynchroSleep.cpp b/src/synchro/SynchroSleep.cpp
similarity index 97%
rename from src/simix/SynchroSleep.cpp
rename to src/synchro/SynchroSleep.cpp
index bc6cbe0..6341574 100644 (file)
--- a/src/simix/SynchroSleep.cpp
+++ b/src/synchro/SynchroSleep.cpp
@@ -7,7 +7,7 @@
 
 #include <simgrid/s4u/host.hpp>
 
 
 #include <simgrid/s4u/host.hpp>
 

-#include "src/simix/SynchroSleep.hpp"
+#include "src/synchro/SynchroSleep.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/simix/popping_private.h"
 #include "src/simix/smx_process_private.h"
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/popping_private.h"
 #include "src/simix/smx_process_private.h"

diff --git a/src/simix/SynchroSleep.hpp b/src/synchro/SynchroSleep.hpp
similarity index 95%
rename from src/simix/SynchroSleep.hpp
rename to src/synchro/SynchroSleep.hpp
index 46a25aa..749195c 100644 (file)
--- a/src/simix/SynchroSleep.hpp
+++ b/src/synchro/SynchroSleep.hpp
@@ -7,7 +7,7 @@
 #define _SIMIX_SYNCHRO_SLEEP_HPP
 
 #include "surf/surf.h"
 #define _SIMIX_SYNCHRO_SLEEP_HPP
 
 #include "surf/surf.h"

-#include "src/simix/Synchro.h"
+#include "src/synchro/Synchro.h"

 
 namespace simgrid {
 namespace simix {
 
 namespace simgrid {
 namespace simix {

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f798306..5b9e593 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -31,12 +31,12 @@ set(EXTRA_DIST
   src/simix/smx_private.h
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h
   src/simix/smx_private.h
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h

-  src/simix/Synchro.h
-  src/simix/SynchroComm.hpp
-  src/simix/SynchroExec.hpp
-  src/simix/SynchroIo.hpp
-  src/simix/SynchroSleep.hpp
-  src/simix/SynchroRaw.hpp
+  src/synchro/Synchro.h
+  src/synchro/SynchroComm.hpp
+  src/synchro/SynchroExec.hpp
+  src/synchro/SynchroIo.hpp
+  src/synchro/SynchroSleep.hpp
+  src/synchro/SynchroRaw.hpp

   src/smpi/README
   src/smpi/colls/coll_tuned_topo.h
   src/smpi/colls/colls.h
   src/smpi/README
   src/smpi/colls/coll_tuned_topo.h
   src/smpi/colls/colls.h


@@ -352,12 +352,12 @@ set(SIMIX_SRC
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp

-  src/simix/Synchro.cpp
-  src/simix/SynchroComm.cpp
-  src/simix/SynchroExec.cpp
-  src/simix/SynchroSleep.cpp
-  src/simix/SynchroRaw.cpp
-  src/simix/SynchroIo.cpp
+  src/synchro/Synchro.cpp
+  src/synchro/SynchroComm.cpp
+  src/synchro/SynchroExec.cpp
+  src/synchro/SynchroSleep.cpp
+  src/synchro/SynchroRaw.cpp
+  src/synchro/SynchroIo.cpp

   
   ${SIMIX_GENERATED_SRC}
   )
   
   ${SIMIX_GENERATED_SRC}
   )