X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e95d2dda61913a92ff3a9d1b7c368ba6e1443b30..8cfd4f9b786027431b78a9b74db0843634ab7397:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a802be5dd5..0aa0645565 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,12 +2,12 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
-  src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
-  src/include/simgrid/sg_config.h
+  src/include/simgrid/sg_config.hpp
   src/include/surf/surf.hpp
   src/include/xbt/parmap.hpp
+  src/include/xbt/mmalloc.h
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/mc/PageStore.hpp
@@ -85,7 +85,7 @@ set(EXTRA_DIST
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
-  
+
   examples/java/.classpath
   examples/java/.project
   )
@@ -221,7 +221,7 @@ set(SMPI_SRC
   src/smpi/internals/smpi_deployment.cpp
   src/smpi/internals/smpi_dvfs.cpp
   src/smpi/internals/smpi_global.cpp
-  src/smpi/internals/SmpiHost.cpp
+  src/smpi/internals/smpi_host.cpp
   src/smpi/internals/smpi_replay.cpp
   src/smpi/internals/smpi_process.cpp
   src/smpi/internals/smpi_utils.cpp
@@ -241,7 +241,7 @@ set(SMPI_SRC
   src/smpi/include/smpi_comm.hpp
   src/smpi/include/smpi_f2c.hpp
   src/smpi/include/smpi_group.hpp
-  src/smpi/include/SmpiHost.hpp
+  src/smpi/include/smpi_host.hpp
   src/smpi/include/smpi_datatype.hpp
   src/smpi/include/smpi_info.hpp
   src/smpi/include/smpi_keyvals.hpp
@@ -252,6 +252,7 @@ set(SMPI_SRC
   src/smpi/include/smpi_status.hpp
   src/smpi/include/smpi_win.hpp
   src/smpi/include/smpi_topo.hpp
+  src/smpi/plugins/sampi_loadbalancer.cpp
   src/surf/network_smpi.cpp
   src/surf/network_ib.cpp
   )
@@ -302,11 +303,11 @@ set(SURF_SRC
   src/kernel/lmm/lagrange.cpp
   src/kernel/lmm/maxmin.hpp
   src/kernel/lmm/maxmin.cpp
-  
+
   src/kernel/resource/Action.cpp
   src/kernel/resource/Model.cpp
   src/kernel/resource/Resource.cpp
-  
+
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/DijkstraZone.cpp
   src/kernel/routing/DragonflyZone.cpp
@@ -319,15 +320,13 @@ set(SURF_SRC
   src/kernel/routing/TorusZone.cpp
   src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp
-  
+
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
 
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
-  src/surf/instr_routing.cpp
-  src/surf/instr_surf.cpp
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
@@ -354,7 +353,6 @@ set(SURF_SRC
   )
 
 set(PLUGINS_SRC
-  src/plugins/file_system/FileSystem.hpp
   src/plugins/file_system/s4u_FileSystem.cpp
   src/plugins/vm/VirtualMachineImpl.hpp
   src/plugins/vm/s4u_VirtualMachine.cpp
@@ -365,7 +363,7 @@ set(PLUGINS_SRC
   src/plugins/vm/VmLiveMigration.cpp
   src/plugins/vm/VmLiveMigration.hpp
   )
-  
+
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/kernel/future.cpp
@@ -387,6 +385,8 @@ set(SIMIX_SRC
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/ConditionVariableImpl.cpp
+  src/kernel/activity/ConditionVariableImpl.hpp
   src/kernel/activity/CommImpl.cpp
   src/kernel/activity/CommImpl.hpp
   src/kernel/activity/ExecImpl.cpp
@@ -401,7 +401,7 @@ set(SIMIX_SRC
   src/kernel/activity/SynchroIo.hpp
   src/kernel/activity/SynchroRaw.cpp
   src/kernel/activity/SynchroRaw.hpp
-  
+
   ${SIMIX_GENERATED_SRC}
   )
 
@@ -419,35 +419,30 @@ else()
 endif()
 
 set(S4U_SRC
-  src/s4u/s4u_actor.cpp
-  src/s4u/s4u_activity.cpp
-  src/s4u/s4u_conditionVariable.cpp
-  src/s4u/s4u_comm.cpp
-  src/s4u/s4u_engine.cpp  
-  src/s4u/s4u_exec.cpp  
-  src/s4u/s4u_host.cpp  
-  src/s4u/s4u_link.cpp
-  src/s4u/s4u_mailbox.cpp
-  src/s4u/s4u_mutex.cpp
-  src/s4u/s4u_netzone.cpp
-  src/s4u/s4u_storage.cpp
+  src/s4u/s4u_Actor.cpp
+  src/s4u/s4u_Activity.cpp
+  src/s4u/s4u_ConditionVariable.cpp
+  src/s4u/s4u_Comm.cpp
+  src/s4u/s4u_Engine.cpp
+  src/s4u/s4u_Exec.cpp
+  src/s4u/s4u_Host.cpp
+  src/s4u/s4u_Link.cpp
+  src/s4u/s4u_Mailbox.cpp
+  src/s4u/s4u_Mutex.cpp
+  src/s4u/s4u_Netzone.cpp
+  src/s4u/s4u_Storage.cpp
 )
 
 set(SIMGRID_SRC
   src/simgrid/sg_config.cpp
-  src/simgrid/host.cpp
   src/simgrid/util.hpp
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.cpp
   src/msg/instr_msg_task.cpp
-  src/msg/msg_actions.cpp
-  src/msg/msg_deployment.cpp
-  src/msg/msg_environment.cpp
   src/msg/msg_global.cpp
   src/msg/msg_gos.cpp
-  src/msg/msg_host.cpp
+  src/msg/msg_legacy.cpp
   src/msg/msg_mailbox.cpp
   src/msg/msg_process.cpp
   src/msg/msg_synchro.cpp
@@ -552,6 +547,7 @@ set(TRACING_SRC
   src/instr/instr_paje_types.hpp
   src/instr/instr_paje_values.cpp
   src/instr/instr_paje_values.hpp
+  src/instr/instr_platform.cpp
   src/instr/instr_private.hpp
   src/instr/instr_smpi.hpp
   src/instr/instr_resource_utilization.cpp
@@ -575,6 +571,7 @@ set(MC_SRC_BASE
   src/mc/mc_replay.hpp
   src/mc/mc_record.cpp
   src/mc/mc_config.cpp
+  src/mc/mc_config.hpp
   src/mc/mc_global.cpp
   )
 
@@ -596,7 +593,7 @@ set(MC_SRC
   src/mc/remote/RemotePtr.hpp
   src/mc/remote/mc_protocol.h
   src/mc/remote/mc_protocol.cpp
-  
+
   src/mc/AddressSpace.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
@@ -633,7 +630,7 @@ set(MC_SRC
   src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
-  src/mc/mc_ignore.h
+  src/mc/mc_ignore.hpp
   src/mc/LocationList.hpp
   src/mc/LocationList.cpp
   src/mc/mc_record.cpp
@@ -660,12 +657,16 @@ set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
 
+  include/simgrid/actor.h
+  include/simgrid/engine.h
   include/simgrid/chrono.hpp
   include/simgrid/plugins/dvfs.h
   include/simgrid/plugins/energy.h
   include/simgrid/plugins/file_system.h
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
+  include/simgrid/plugins/load_balancer.h
+  include/simgrid/smpi/replay.hpp
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
@@ -677,20 +678,22 @@ set(headers_to_install
   include/simgrid/kernel/future.hpp
   include/simgrid/host.h
   include/simgrid/link.h
-  include/simgrid/s4u/forward.hpp
+  include/simgrid/storage.h
+  include/simgrid/vm.h
+  include/simgrid/zone.h
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
   include/simgrid/s4u/Comm.hpp
   include/simgrid/s4u/ConditionVariable.hpp
-  include/simgrid/s4u/Engine.hpp  
+  include/simgrid/s4u/Engine.hpp
   include/simgrid/s4u/Exec.hpp
-  include/simgrid/s4u/Host.hpp  
-  include/simgrid/s4u/Link.hpp  
+  include/simgrid/s4u/Host.hpp
+  include/simgrid/s4u/Link.hpp
   include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/NetZone.hpp
-  include/simgrid/s4u/Storage.hpp  
-  include/simgrid/s4u/VirtualMachine.hpp  
+  include/simgrid/s4u/Storage.hpp
+  include/simgrid/s4u/VirtualMachine.hpp
   include/simgrid/s4u.hpp
 
   include/simgrid/kernel/resource/Action.hpp
@@ -708,11 +711,12 @@ set(headers_to_install
   include/simgrid/kernel/routing/NetZoneImpl.hpp
   include/simgrid/kernel/routing/RoutedZone.hpp
   include/simgrid/kernel/routing/TorusZone.hpp
-  include/simgrid/kernel/routing/VivaldiZone.hpp  
+  include/simgrid/kernel/routing/VivaldiZone.hpp
 
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
+  include/smpi/smpi_helpers.h
   include/smpi/smpi_extended_traces.h
   include/smpi/smpi_extended_traces_fortran.h
   include/smpi/forward.hpp
@@ -728,7 +732,6 @@ set(headers_to_install
   include/xbt/cunit.h
   include/xbt/dict.h
   include/xbt/dynar.h
-  include/xbt/dynar.hpp
   include/xbt/ex.h
   include/xbt/ex.hpp
   include/xbt/exception.hpp
@@ -742,7 +745,6 @@ set(headers_to_install
   include/xbt/log.hpp
   include/xbt/mallocator.h
   include/xbt/misc.h
-  include/xbt/mmalloc.h
   include/xbt/module.h
   include/xbt/parmap.h
   include/xbt/range.hpp
@@ -803,7 +805,7 @@ set(simgrid_sources
   ${XBT_SRC}
   )
 
-if(${SIMGRID_HAVE_JEDULE})  
+if(${SIMGRID_HAVE_JEDULE})
   set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${JEDULE_SRC})
@@ -889,10 +891,10 @@ set(DOC_SOURCES
   doc/doxygen/module-index.doc
   doc/doxygen/ns3.doc
   doc/doxygen/options.doc
-  doc/doxygen/outcomes.doc  
-  doc/doxygen/outcomes_logs.doc  
-  doc/doxygen/outcomes_MC.doc  
-  doc/doxygen/outcomes_vizu.doc  
+  doc/doxygen/outcomes.doc
+  doc/doxygen/outcomes_logs.doc
+  doc/doxygen/outcomes_MC.doc
+  doc/doxygen/outcomes_vizu.doc
   doc/doxygen/platform.doc
   doc/doxygen/platform_lua.doc
   doc/doxygen/scenario.doc
@@ -979,7 +981,7 @@ set(txt_files
   TODO
   )
 
-# The list of cmake build directories is constructed from the following list. 
+# The list of cmake build directories is constructed from the following list.
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
   examples/java/CMakeLists.txt
@@ -1003,7 +1005,7 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
-  
+
   teshsuite/smpi/isp/umpire/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
@@ -1035,7 +1037,7 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
-  
+
   tools/CMakeLists.txt
   tools/graphicator/CMakeLists.txt
   tools/tesh/CMakeLists.txt