[simix] Port ThreadContext to C++

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4be343f..cb6c6d0 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -30,14 +30,15 @@ set(EXTRA_DIST
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
-  src/simix/popping_bodies.c
-  src/simix/popping_generated.c
+  src/simix/popping_bodies.cpp
+  src/simix/popping_generated.cpp
   src/simix/popping_enum.h
   src/simix/popping_accessors.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
+  src/simix/smx_private.hpp
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
@@ -83,7 +84,7 @@ set(EXTRA_DIST
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
   src/surf/vm_hl13.hpp
-  src/surf/vm_interface.hpp
+  src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
   src/surf/host_ptask_L07.hpp
@@ -105,6 +106,7 @@ set(EXTRA_DIST
   src/xbt/heap_private.h
   src/xbt/log_private.h
   src/xbt/mallocator_private.h
+
   src/xbt/mmalloc/mfree.c
   src/xbt/mmalloc/mm.c
   src/xbt/mmalloc/mm_legacy.c
@@ -229,6 +231,7 @@ set(SMPI_SRC
   src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
+  src/smpi/smpi_memory.cpp
   src/smpi/smpi_c99.c
   src/smpi/smpi_coll.c
   src/smpi/smpi_comm.c
@@ -264,6 +267,8 @@ set(XBT_SRC
   src/xbt/lib.c
   src/xbt/log.c
   src/xbt/mallocator.c
+  src/xbt/memory_map.cpp
+  src/xbt/memory_map.hpp
   src/xbt/parmap.cpp
   src/xbt/set.c
   src/xbt/snprintf.c
@@ -284,6 +289,7 @@ set(XBT_SRC
   src/xbt/xbt_strbuff.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
+
   )
 
 if(HAVE_MMALLOC)
@@ -302,11 +308,13 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
+  src/surf/callbacks.h
+  src/surf/callbacks.cpp
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   src/surf/fair_bottleneck.cpp
-  src/surf/instr_routing.c
+  src/surf/instr_routing.cpp
   src/surf/instr_surf.c
   src/surf/lagrange.cpp
   src/surf/maxmin.cpp
@@ -318,7 +326,7 @@ set(SURF_SRC
   src/surf/platf_generator.c
   src/surf/plugins/energy.cpp
   src/surf/random_mgr.c
-  src/surf/sg_platf.c
+  src/surf/sg_platf.cpp
   src/surf/storage_interface.cpp
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
@@ -337,7 +345,7 @@ set(SURF_SRC
   src/surf/surfxml_parseplatf.c
   src/surf/trace_mgr.c
   src/surf/vm_hl13.cpp
-  src/surf/vm_interface.cpp
+  src/surf/virtual_machine.cpp
   src/surf/host_clm03.cpp
   src/surf/host_interface.cpp
   src/surf/host_ptask_L07.cpp
@@ -345,46 +353,48 @@ set(SURF_SRC
   )
 
 set(SIMIX_GENERATED_SRC
-  src/simix/popping_generated.c
+  src/simix/popping_generated.cpp
   )
 set(SIMIX_SRC
-  src/simix/libsmx.c
-  src/simix/smx_context.c
-  src/simix/smx_context_base.c
-  src/simix/smx_deployment.c
-  src/simix/smx_environment.c
-  src/simix/smx_global.c
-  src/simix/smx_host.c
-  src/simix/smx_io.c
-  src/simix/smx_network.c
-  src/simix/smx_process.c
-  src/simix/smx_synchro.c
-  src/simix/smx_vm.c
-  src/simix/popping.c
+  src/simix/libsmx.cpp
+  src/simix/smx_context.cpp
+  src/simix/Context.cpp
+  src/simix/smx_deployment.cpp
+  src/simix/smx_environment.cpp
+  src/simix/smx_global.cpp
+  src/simix/smx_host.cpp
+  src/simix/smx_io.cpp
+  src/simix/smx_network.cpp
+  src/simix/smx_process.cpp
+  src/simix/smx_synchro.cpp
+  src/simix/smx_vm.cpp
+  src/simix/popping.cpp
 
   ${SIMIX_GENERATED_SRC}
   )
 
 # Don't try to compile our inline assembly with MSVC
-if (MSVC)
+if (1)
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_raw.c)
+      src/simix/smx_context_raw.cpp)
 else()
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_raw.c)
+      src/simix/smx_context_raw.cpp)
 endif()
 
 # Boost context may not be available
 if (HAVE_BOOST_CONTEXT)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 endif()
 
 set(S4U_SRC
@@ -654,8 +664,6 @@ set(MC_SRC
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.cpp
-  src/mc/mcer_ignore.cpp
-  src/mc/mcer_ignore.h
   src/mc/mc_ignore.h
   src/mc/mc_liveness.h
   src/mc/LocationList.hpp
@@ -673,15 +681,11 @@ set(MC_SRC
   src/mc/mc_state.h
   src/mc/mc_state.cpp
   src/mc/mc_visited.cpp
-  src/mc/mc_memory_map.h
-  src/mc/memory_map.cpp
   src/mc/mc_client.cpp
   src/mc/mc_client_api.cpp
   src/mc/mc_client.h
   src/mc/mc_protocol.h
   src/mc/mc_protocol.cpp
-  src/mc/mc_server.cpp
-  src/mc/mc_server.h
   src/mc/mc_smx.h
   src/mc/mc_smx.cpp
   src/mc/mc_xbt.hpp
@@ -708,6 +712,7 @@ set(headers_to_install
   include/simgrid/platf_generator.h
   include/simgrid/plugins.h
   include/simgrid/simix.h
+  include/simgrid/simix.hpp
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/s4u/actor.hpp
@@ -776,13 +781,25 @@ set(source_of_generated_headers
 if(${CONTEXT_THREADS}) #pthread
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_thread.c
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+else() # NOT pthread
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+endif()
+
+if(${CONTEXT_THREADS}) #pthread
+  set(SURF_SRC
+    ${SURF_SRC}
     src/xbt/xbt_os_thread.c
     )
 else() # NOT pthread
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_thread.c
     src/xbt/xbt_os_thread.c
     )
 endif()
@@ -790,12 +807,12 @@ endif()
 if(${CONTEXT_UCONTEXT}) #ucontext
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_sysv.c
+    src/simix/smx_context_sysv.cpp
     )
 else() # NOT ucontext
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_sysv.c
+    src/simix/smx_context_sysv.cpp
     )
 endif()
 
@@ -858,7 +875,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/smx_context_thread.c
+    src/simix/src/simix/ThreadContext.cpp
+    src/simix/src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )