populate the kernel/context directory

diff --git a/src/simix/Context.cpp b/src/kernel/context/Context.cpp
similarity index 100%
rename from src/simix/Context.cpp
rename to src/kernel/context/Context.cpp

diff --git a/src/simix/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
similarity index 99%
rename from src/simix/ContextBoost.cpp
rename to src/kernel/context/ContextBoost.cpp
index 605fee7..17fd4c8 100644 (file)
--- a/src/simix/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -14,9 +14,9 @@
 #include <xbt/log.h>
 #include <xbt/xbt_os_thread.h>
 
-#include "smx_private.h"
+#include "src/simix/smx_private.h"
 #include "src/internal_config.h"
-#include "src/simix/ContextBoost.hpp"
+#include "src/kernel/context/ContextBoost.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

diff --git a/src/simix/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
similarity index 100%
rename from src/simix/ContextBoost.hpp
rename to src/kernel/context/ContextBoost.hpp

diff --git a/src/simix/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
similarity index 99%
rename from src/simix/ContextRaw.cpp
rename to src/kernel/context/ContextRaw.cpp
index a11741f..600e935 100644 (file)
--- a/src/simix/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -15,7 +15,7 @@
 #include "xbt/parmap.h"
 #include "xbt/dynar.h"
 
-#include "smx_private.h"
+#include "src/simix/smx_private.h"
 #include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);

diff --git a/src/simix/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
similarity index 98%
rename from src/simix/ContextThread.cpp
rename to src/kernel/context/ContextThread.cpp
index dd82a17..8b424d4 100644 (file)
--- a/src/simix/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -8,13 +8,13 @@
 #include <functional>
 
 #include "xbt/function_types.h"
-#include "smx_private.h"
+#include "src/simix/smx_private.h"
 #include "src/internal_config.h"           /* loads context system definitions */
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "src/xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
 
-#include "src/simix/ContextThread.hpp"
+#include "src/kernel/context/ContextThread.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

diff --git a/src/simix/ContextThread.hpp b/src/kernel/context/ContextThread.hpp
similarity index 100%
rename from src/simix/ContextThread.hpp
rename to src/kernel/context/ContextThread.hpp

diff --git a/src/simix/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
similarity index 100%
rename from src/simix/ContextUnix.cpp
rename to src/kernel/context/ContextUnix.cpp

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f28e62d..5df2e04 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -340,8 +340,8 @@ set(SIMIX_SRC
   src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
-  src/simix/Context.cpp
-  src/simix/ContextRaw.cpp
+  src/kernel/context/Context.cpp
+  src/kernel/context/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -366,13 +366,13 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
@@ -719,11 +719,11 @@ set(source_of_generated_headers
 ### depend of some variables setted upper
 # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
@@ -734,9 +734,9 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
@@ -775,8 +775,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ContextThread.cpp
-    src/simix/ContextThread.hpp
+    src/kernel/context/ContextThread.cpp
+    src/kernel/context/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()