X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ccebd8729f00d1125f343c9dce5b093f40f8cc7..db1df4b379b3e088b50f6e573ba9b0887b59c96a:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index aae0218237..9b9281354c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -2,7 +2,6 @@ set(EXTRA_DIST src/bindings/java/MANIFEST.in - src/include/instr/instr_interface.hpp src/include/mc/datatypes.h src/include/mc/mc.h src/include/simgrid/sg_config.hpp @@ -11,7 +10,6 @@ set(EXTRA_DIST src/include/xbt/mmalloc.h src/mc/mc_mmu.hpp src/mc/mc_record.hpp - src/mc/PageStore.hpp src/msg/msg_private.hpp src/simdag/dax.dtd src/simdag/dax_dtd.c @@ -45,6 +43,8 @@ set(EXTRA_DIST src/surf/network_ib.hpp src/surf/ns3/ns3_simulator.hpp src/surf/trace_mgr_test.cpp + src/mc/sosp/mc_snapshot_test.cpp + src/mc/sosp/PageStore_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c @@ -222,7 +222,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 @@ -242,7 +242,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 @@ -328,15 +328,9 @@ set(SURF_SRC src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp - src/surf/instr_routing.cpp src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp - src/surf/plugins/dirty_page_tracking.cpp - src/surf/plugins/host_dvfs.cpp - src/surf/plugins/host_energy.cpp - src/surf/plugins/link_energy.cpp - src/surf/plugins/host_load.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp src/surf/StorageImpl.cpp @@ -355,6 +349,11 @@ set(SURF_SRC ) set(PLUGINS_SRC + src/plugins/dirty_page_tracking.cpp + src/plugins/host_dvfs.cpp + src/plugins/host_energy.cpp + src/plugins/link_energy.cpp + src/plugins/host_load.cpp src/plugins/file_system/s4u_FileSystem.cpp src/plugins/vm/VirtualMachineImpl.hpp src/plugins/vm/s4u_VirtualMachine.cpp @@ -371,6 +370,7 @@ set(SIMIX_SRC src/kernel/future.cpp src/simix/libsmx.cpp src/simix/smx_context.cpp + src/kernel/context/context_private.hpp src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp @@ -393,14 +393,14 @@ set(SIMIX_SRC src/kernel/activity/CommImpl.hpp src/kernel/activity/ExecImpl.cpp src/kernel/activity/ExecImpl.hpp + src/kernel/activity/IoImpl.cpp + src/kernel/activity/IoImpl.hpp src/kernel/activity/MailboxImpl.cpp src/kernel/activity/MailboxImpl.hpp src/kernel/activity/MutexImpl.cpp src/kernel/activity/MutexImpl.hpp src/kernel/activity/SleepImpl.cpp src/kernel/activity/SleepImpl.hpp - src/kernel/activity/SynchroIo.cpp - src/kernel/activity/SynchroIo.hpp src/kernel/activity/SynchroRaw.cpp src/kernel/activity/SynchroRaw.hpp @@ -437,19 +437,14 @@ set(S4U_SRC 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_deployment.cpp - src/msg/msg_environment.cpp src/msg/msg_global.cpp src/msg/msg_gos.cpp src/msg/msg_legacy.cpp - src/msg/msg_mailbox.cpp src/msg/msg_process.cpp src/msg/msg_synchro.cpp src/msg/msg_task.cpp @@ -553,6 +548,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 @@ -599,6 +595,17 @@ set(MC_SRC src/mc/remote/mc_protocol.h src/mc/remote/mc_protocol.cpp + src/mc/sosp/PageStore.hpp + src/mc/sosp/PageStore.cpp + src/mc/sosp/ChunkedData.hpp + src/mc/sosp/ChunkedData.cpp + src/mc/sosp/RegionSnapshot.cpp + src/mc/sosp/RegionSnapshot.hpp + src/mc/sosp/mc_checkpoint.cpp + src/mc/sosp/mc_snapshot.hpp + src/mc/sosp/mc_snapshot.cpp + src/mc/sosp/mc_page_snapshot.cpp + src/mc/AddressSpace.hpp src/mc/Frame.hpp src/mc/Frame.cpp @@ -606,12 +613,6 @@ set(MC_SRC src/mc/ModelChecker.cpp src/mc/ObjectInformation.hpp src/mc/ObjectInformation.cpp - src/mc/PageStore.hpp - src/mc/PageStore.cpp - src/mc/ChunkedData.hpp - src/mc/ChunkedData.cpp - src/mc/RegionSnapshot.cpp - src/mc/RegionSnapshot.hpp src/mc/Type.hpp src/mc/Variable.hpp src/mc/mc_forward.hpp @@ -620,10 +621,6 @@ set(MC_SRC src/mc/mc_unw.hpp src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp - src/mc/mc_checkpoint.cpp - src/mc/mc_snapshot.hpp - src/mc/mc_snapshot.cpp - src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.cpp src/mc/mc_comm_pattern.hpp src/mc/compare.cpp @@ -662,7 +659,9 @@ set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install + include/simgrid_config.h include/simgrid/actor.h + include/simgrid/engine.h include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h @@ -672,6 +671,7 @@ set(headers_to_install include/simgrid/plugins/load_balancer.h include/simgrid/smpi/replay.hpp include/simgrid/instr.h + include/simgrid/mailbox.h include/simgrid/msg.h include/simgrid/simdag.h include/simgrid/modelchecker.h @@ -721,6 +721,7 @@ set(headers_to_install include/smpi/smpi.h include/smpi/smpi_main.h include/smpi/smpi_helpers.h + include/smpi/smpi_helpers_internal.h include/smpi/smpi_extended_traces.h include/smpi/smpi_extended_traces_fortran.h include/smpi/forward.hpp @@ -766,7 +767,7 @@ set(headers_to_install include/xbt/xbt_os_time.h ) set(source_of_generated_headers - include/simgrid_config.h.in + include/simgrid/config.h.in include/smpi/mpif.h.in) ### depend of some variables setted upper @@ -796,17 +797,17 @@ endif() ### Simgrid Lib sources set(simgrid_sources - ${PLUGINS_SRC} - ${BINDINGS_SRC} - ${MC_SRC_BASE} - ${MSG_SRC} ${S4U_SRC} - ${SIMDAG_SRC} ${SIMGRID_SRC} + ${MC_SRC_BASE} ${SIMIX_SRC} ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC} + ${PLUGINS_SRC} + ${BINDINGS_SRC} + ${MSG_SRC} + ${SIMDAG_SRC} ) if(${SIMGRID_HAVE_JEDULE})