From 60087ab28ce5450ad32f128cffbb09eb492eb550 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 6 May 2016 22:32:25 +0200
Subject: [PATCH] sort Context files

---
 .../{BoostContext.cpp => ContextBoost.cpp}    |  2 +-
 .../{BoostContext.hpp => ContextBoost.hpp}    |  0
 src/simix/{RawContext.cpp => ContextRaw.cpp}  |  0
 .../{ThreadContext.cpp => ContextThread.cpp}  |  2 +-
 .../{ThreadContext.hpp => ContextThread.hpp}  |  0
 src/simix/{UContext.cpp => ContextUnix.cpp}   |  0
 src/simix/smx_process.cpp                     |  6 ++---
 tools/cmake/DefinePackages.cmake              | 26 +++++++++----------
 8 files changed, 18 insertions(+), 18 deletions(-)
 rename src/simix/{BoostContext.cpp => ContextBoost.cpp} (99%)
 rename src/simix/{BoostContext.hpp => ContextBoost.hpp} (100%)
 rename src/simix/{RawContext.cpp => ContextRaw.cpp} (100%)
 rename src/simix/{ThreadContext.cpp => ContextThread.cpp} (99%)
 rename src/simix/{ThreadContext.hpp => ContextThread.hpp} (100%)
 rename src/simix/{UContext.cpp => ContextUnix.cpp} (100%)

diff --git a/src/simix/BoostContext.cpp b/src/simix/ContextBoost.cpp
similarity index 99%
rename from src/simix/BoostContext.cpp
rename to src/simix/ContextBoost.cpp
index 241ecc36b7..38dc3149e3 100644
--- a/src/simix/BoostContext.cpp
+++ b/src/simix/ContextBoost.cpp
@@ -20,7 +20,7 @@
 #include "smx_private.h"
 #include "smx_private.hpp"
 #include "src/internal_config.h"
-#include "src/simix/BoostContext.hpp"
+#include "src/simix/ContextBoost.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
diff --git a/src/simix/BoostContext.hpp b/src/simix/ContextBoost.hpp
similarity index 100%
rename from src/simix/BoostContext.hpp
rename to src/simix/ContextBoost.hpp
diff --git a/src/simix/RawContext.cpp b/src/simix/ContextRaw.cpp
similarity index 100%
rename from src/simix/RawContext.cpp
rename to src/simix/ContextRaw.cpp
diff --git a/src/simix/ThreadContext.cpp b/src/simix/ContextThread.cpp
similarity index 99%
rename from src/simix/ThreadContext.cpp
rename to src/simix/ContextThread.cpp
index 722ff30f60..c020d560c1 100644
--- a/src/simix/ThreadContext.cpp
+++ b/src/simix/ContextThread.cpp
@@ -15,7 +15,7 @@
 #include "src/xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
 
 #include "src/simix/smx_private.hpp"
-#include "src/simix/ThreadContext.hpp"
+#include "src/simix/ContextThread.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
diff --git a/src/simix/ThreadContext.hpp b/src/simix/ContextThread.hpp
similarity index 100%
rename from src/simix/ThreadContext.hpp
rename to src/simix/ContextThread.hpp
diff --git a/src/simix/UContext.cpp b/src/simix/ContextUnix.cpp
similarity index 100%
rename from src/simix/UContext.cpp
rename to src/simix/ContextUnix.cpp
diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 02daca1a6d..82b4d162a4 100644
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -81,10 +81,10 @@ void SIMIX_process_cleanup(smx_process_t process)
       comm->src_proc = NULL;
 
       /* I'm not supposed to destroy a detached comm from the sender side, */
-      if (!comm->detached)
-        SIMIX_comm_destroy(comm);
+      if (comm->detached)
+        XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender");
       else
-        XBT_DEBUG("Don't destroy it since it's a detached comm");
+        SIMIX_comm_destroy(comm);
 
     }
     else if (comm->dst_proc == process){
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d805523e67..1ea2fac11d 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -336,7 +336,7 @@ set(SIMIX_SRC
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
   src/simix/Context.cpp
-  src/simix/RawContext.cpp
+  src/simix/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -361,13 +361,13 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/BoostContext.hpp
-      src/simix/BoostContext.cpp)
+      src/simix/ContextBoost.hpp
+      src/simix/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/BoostContext.hpp
-      src/simix/BoostContext.cpp)
+      src/simix/ContextBoost.hpp
+      src/simix/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
@@ -699,14 +699,14 @@ set(source_of_generated_headers
 if(${HAVE_THREAD_CONTEXTS}) #pthread
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
+    src/simix/ContextThread.cpp
+    src/simix/ContextThread.hpp
     )
 else() # NOT pthread
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
+    src/simix/ContextThread.cpp
+    src/simix/ContextThread.hpp
     )
 endif()
 
@@ -718,9 +718,9 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/UContext.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/UContext.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
@@ -759,8 +759,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
+    src/simix/ContextThread.cpp
+    src/simix/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()
-- 
2.20.1