A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP. crude surf_file_t to FileImpl conversion
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index
5aa4170
..
4c2e631
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-30,12
+30,6
@@
set(EXTRA_DIST
src/simix/smx_network_private.h
src/simix/smx_private.h
src/simix/smx_synchro_private.h
src/simix/smx_network_private.h
src/simix/smx_private.h
src/simix/smx_synchro_private.h
- src/kernel/activity/ActivityImpl.hpp
- src/kernel/activity/SynchroComm.hpp
- src/kernel/activity/SynchroExec.hpp
- src/kernel/activity/SynchroIo.hpp
- src/kernel/activity/SynchroSleep.hpp
- src/kernel/activity/SynchroRaw.hpp
src/smpi/colls/coll_tuned_topo.h
src/smpi/colls/colls_private.h
src/smpi/colls/smpi_mvapich2_selector_stampede.h
src/smpi/colls/coll_tuned_topo.h
src/smpi/colls/colls_private.h
src/smpi/colls/smpi_mvapich2_selector_stampede.h
@@
-53,12
+47,14
@@
set(EXTRA_DIST
src/surf/network_ib.hpp
src/surf/ns3/ns3_interface.h
src/surf/ns3/ns3_simulator.h
src/surf/network_ib.hpp
src/surf/ns3/ns3_interface.h
src/surf/ns3/ns3_simulator.h
+ src/surf/trace_mgr_test.cpp
src/surf/xml/simgrid.dtd
src/surf/xml/simgrid_dtd.h
src/surf/xml/simgrid_dtd.c
src/surf/xml/surfxml_sax_cb.cpp
src/surf/xml/simgrid.dtd
src/surf/xml/simgrid_dtd.h
src/surf/xml/simgrid_dtd.c
src/surf/xml/surfxml_sax_cb.cpp
- src/surf/storage_interface.hpp
+ src/surf/FileImpl.hpp
+ src/surf/StorageImpl.hpp
src/surf/storage_n11.hpp
src/surf/surf_interface.hpp
src/surf/surf_private.h
src/surf/storage_n11.hpp
src/surf/surf_interface.hpp
src/surf/surf_private.h
@@
-207,6
+203,7
@@
set(SMPI_SRC
src/smpi/instr_smpi.cpp
src/smpi/smpi_bench.cpp
src/smpi/smpi_memory.cpp
src/smpi/instr_smpi.cpp
src/smpi/smpi_bench.cpp
src/smpi/smpi_memory.cpp
+ src/smpi/smpi_shared.cpp
src/smpi/smpi_static_variables.cpp
src/smpi/smpi_coll.cpp
src/smpi/smpi_coll.hpp
src/smpi/smpi_static_variables.cpp
src/smpi/smpi_coll.cpp
src/smpi/smpi_coll.hpp
@@
-219,6
+216,8
@@
set(SMPI_SRC
src/smpi/smpi_f2c.hpp
src/smpi/smpi_group.cpp
src/smpi/smpi_group.hpp
src/smpi/smpi_f2c.hpp
src/smpi/smpi_group.cpp
src/smpi/smpi_group.hpp
+ src/smpi/SmpiHost.cpp
+ src/smpi/SmpiHost.hpp
src/smpi/smpi_mpi.cpp
src/smpi/smpi_datatype.cpp
src/smpi/smpi_datatype.hpp
src/smpi/smpi_mpi.cpp
src/smpi/smpi_datatype.cpp
src/smpi/smpi_datatype.hpp
@@
-228,6
+227,7
@@
set(SMPI_SRC
src/smpi/smpi_keyvals.hpp
src/smpi/smpi_datatype_derived.cpp
src/smpi/smpi_datatype_derived.hpp
src/smpi/smpi_keyvals.hpp
src/smpi/smpi_datatype_derived.cpp
src/smpi/smpi_datatype_derived.hpp
+ src/smpi/smpi_main.c
src/smpi/smpi_op.cpp
src/smpi/smpi_op.hpp
src/smpi/smpi_process.cpp
src/smpi/smpi_op.cpp
src/smpi/smpi_op.hpp
src/smpi/smpi_process.cpp
@@
-264,7
+264,6
@@
set(XBT_SRC
src/xbt/exception.cpp
src/xbt/graph.c
src/xbt/heap.c
src/xbt/exception.cpp
src/xbt/graph.c
src/xbt/heap.c
- src/xbt/lib.c
src/xbt/log.c
src/xbt/mallocator.c
src/xbt/memory_map.cpp
src/xbt/log.c
src/xbt/mallocator.c
src/xbt/memory_map.cpp
@@
-277,13
+276,11
@@
set(XBT_SRC
src/xbt/xbt_log_layout_format.c
src/xbt/xbt_log_layout_simple.c
src/xbt/xbt_main.cpp
src/xbt/xbt_log_layout_format.c
src/xbt/xbt_log_layout_simple.c
src/xbt/xbt_main.cpp
- src/xbt/xbt_matrix.c
src/xbt/xbt_os_file.c
src/xbt/xbt_os_synchro.c
src/xbt/xbt_os_time.c
src/xbt/xbt_replay.cpp
src/xbt/xbt_str.cpp
src/xbt/xbt_os_file.c
src/xbt/xbt_os_synchro.c
src/xbt/xbt_os_time.c
src/xbt/xbt_replay.cpp
src/xbt/xbt_str.cpp
- src/xbt/xbt_strbuff.c
src/xbt/xbt_virtu.c
src/xbt_modinter.h
)
src/xbt/xbt_virtu.c
src/xbt_modinter.h
)
@@
-339,7
+336,7
@@
set(SURF_SRC
src/surf/plugins/host_load.cpp
src/surf/PropertyHolder.cpp
src/surf/sg_platf.cpp
src/surf/plugins/host_load.cpp
src/surf/PropertyHolder.cpp
src/surf/sg_platf.cpp
- src/surf/
storage_interface
.cpp
+ src/surf/
StorageImpl
.cpp
src/surf/storage_n11.cpp
src/surf/surf_c_bindings.cpp
src/surf/surf_interface.cpp
src/surf/storage_n11.cpp
src/surf/surf_c_bindings.cpp
src/surf/surf_interface.cpp
@@
-381,13
+378,19
@@
set(SIMIX_SRC
src/simix/smx_synchro.cpp
src/simix/popping.cpp
src/kernel/activity/ActivityImpl.cpp
src/simix/smx_synchro.cpp
src/simix/popping.cpp
src/kernel/activity/ActivityImpl.cpp
+ src/kernel/activity/ActivityImpl.hpp
+ src/kernel/activity/CommImpl.cpp
+ src/kernel/activity/CommImpl.hpp
+ src/kernel/activity/ExecImpl.cpp
+ src/kernel/activity/ExecImpl.hpp
src/kernel/activity/MailboxImpl.cpp
src/kernel/activity/MailboxImpl.hpp
src/kernel/activity/MailboxImpl.cpp
src/kernel/activity/MailboxImpl.hpp
- src/kernel/activity/SynchroComm.cpp
- src/kernel/activity/SynchroExec.cpp
- src/kernel/activity/SynchroSleep.cpp
- src/kernel/activity/SynchroRaw.cpp
+ src/kernel/activity/SleepImpl.cpp
+ src/kernel/activity/SleepImpl.hpp
src/kernel/activity/SynchroIo.cpp
src/kernel/activity/SynchroIo.cpp
+ src/kernel/activity/SynchroIo.hpp
+ src/kernel/activity/SynchroRaw.cpp
+ src/kernel/activity/SynchroRaw.hpp
${SIMIX_GENERATED_SRC}
)
${SIMIX_GENERATED_SRC}
)
@@
-529,7
+532,6
@@
set(LUA_SRC
)
set(TRACING_SRC
)
set(TRACING_SRC
- src/instr/instr_TI_trace.cpp
src/instr/instr_config.cpp
src/instr/instr_interface.cpp
src/instr/instr_paje_containers.cpp
src/instr/instr_config.cpp
src/instr/instr_interface.cpp
src/instr/instr_paje_containers.cpp
@@
-540,7
+542,6
@@
set(TRACING_SRC
src/instr/instr_private.h
src/instr/instr_smpi.h
src/instr/instr_resource_utilization.cpp
src/instr/instr_private.h
src/instr/instr_smpi.h
src/instr/instr_resource_utilization.cpp
- src/instr/instr_trace.cpp
)
set(JEDULE_SRC
)
set(JEDULE_SRC
@@
-582,7
+583,6
@@
set(MC_SRC
src/mc/remote/mc_protocol.cpp
src/mc/AddressSpace.hpp
src/mc/remote/mc_protocol.cpp
src/mc/AddressSpace.hpp
- src/mc/AddressSpace.cpp
src/mc/Frame.hpp
src/mc/Frame.cpp
src/mc/ModelChecker.hpp
src/mc/Frame.hpp
src/mc/Frame.cpp
src/mc/ModelChecker.hpp
@@
-596,7
+596,6
@@
set(MC_SRC
src/mc/RegionSnapshot.cpp
src/mc/RegionSnapshot.hpp
src/mc/Type.hpp
src/mc/RegionSnapshot.cpp
src/mc/RegionSnapshot.hpp
src/mc/Type.hpp
- src/mc/Variable.cpp
src/mc/Variable.hpp
src/mc/mc_forward.hpp
src/mc/Process.hpp
src/mc/Variable.hpp
src/mc/mc_forward.hpp
src/mc/Process.hpp
@@
-669,16
+668,16
@@
set(headers_to_install
include/simgrid/s4u/forward.hpp
include/simgrid/s4u/Activity.hpp
include/simgrid/s4u/Actor.hpp
include/simgrid/s4u/forward.hpp
include/simgrid/s4u/Activity.hpp
include/simgrid/s4u/Actor.hpp
- include/simgrid/s4u/
c
omm.hpp
- include/simgrid/s4u/
c
onditionVariable.hpp
- include/simgrid/s4u/
e
ngine.hpp
- include/simgrid/s4u/
f
ile.hpp
- include/simgrid/s4u/
h
ost.hpp
+ include/simgrid/s4u/
C
omm.hpp
+ include/simgrid/s4u/
C
onditionVariable.hpp
+ include/simgrid/s4u/
E
ngine.hpp
+ include/simgrid/s4u/
F
ile.hpp
+ include/simgrid/s4u/
H
ost.hpp
include/simgrid/s4u/Link.hpp
include/simgrid/s4u/Mailbox.hpp
include/simgrid/s4u/Mutex.hpp
include/simgrid/s4u/NetZone.hpp
include/simgrid/s4u/Link.hpp
include/simgrid/s4u/Mailbox.hpp
include/simgrid/s4u/Mutex.hpp
include/simgrid/s4u/NetZone.hpp
- include/simgrid/s4u/
s
torage.hpp
+ include/simgrid/s4u/
S
torage.hpp
include/simgrid/s4u/VirtualMachine.hpp
include/simgrid/s4u.hpp
include/simgrid/plugins/energy.h
include/simgrid/s4u/VirtualMachine.hpp
include/simgrid/s4u.hpp
include/simgrid/plugins/energy.h
@@
-689,7
+688,6
@@
set(headers_to_install
include/smpi/smpi_extended_traces.h
include/smpi/smpi_extended_traces_fortran.h
include/smpi/forward.hpp
include/smpi/smpi_extended_traces.h
include/smpi/smpi_extended_traces_fortran.h
include/smpi/forward.hpp
- include/surf/surf_routing.h
include/xbt.h
include/xbt/RngStream.h
include/xbt/asserts.h
include/xbt.h
include/xbt/RngStream.h
include/xbt/asserts.h
@@
-715,13
+713,10
@@
set(headers_to_install
include/xbt/future.hpp
include/xbt/graph.h
include/xbt/heap.h
include/xbt/future.hpp
include/xbt/graph.h
include/xbt/heap.h
- include/xbt/lib.h
include/xbt/Extendable.hpp
include/xbt/log.h
include/xbt/log.hpp
include/xbt/mallocator.h
include/xbt/Extendable.hpp
include/xbt/log.h
include/xbt/log.hpp
include/xbt/mallocator.h
- include/xbt/matrix.h
- include/xbt/memory.hpp
include/xbt/misc.h
include/xbt/mmalloc.h
include/xbt/module.h
include/xbt/misc.h
include/xbt/mmalloc.h
include/xbt/module.h
@@
-729,7
+724,6
@@
set(headers_to_install
include/xbt/range.hpp
include/xbt/replay.hpp
include/xbt/str.h
include/xbt/range.hpp
include/xbt/replay.hpp
include/xbt/str.h
- include/xbt/strbuff.h
include/xbt/swag.h
include/xbt/synchro.h
include/xbt/sysdep.h
include/xbt/swag.h
include/xbt/synchro.h
include/xbt/sysdep.h
@@
-781,7
+775,7
@@
set(simgrid_sources
${XBT_SRC}
)
${XBT_SRC}
)
-if(${HAVE_JEDULE})
+if(${
SIMGRID_
HAVE_JEDULE})
set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC})
else()
set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC})
set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC})
else()
set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC})
@@
-791,11
+785,11
@@
if(enable_smpi)
set(simgrid_sources ${simgrid_sources} ${SMPI_SRC})
endif()
set(simgrid_sources ${simgrid_sources} ${SMPI_SRC})
endif()
-if(HAVE_MC)
+if(
SIMGRID_
HAVE_MC)
set(simgrid_sources ${simgrid_sources} ${MC_SRC})
endif()
set(simgrid_sources ${simgrid_sources} ${MC_SRC})
endif()
-if(HAVE_NS3)
+if(
SIMGRID_
HAVE_NS3)
set(simgrid_sources ${simgrid_sources} ${NS3_SRC})
endif()
set(simgrid_sources ${simgrid_sources} ${NS3_SRC})
endif()
@@
-809,7
+803,7
@@
if(WIN32)
)
endif()
)
endif()
-if(HAVE_LUA)
+if(
SIMGRID_
HAVE_LUA)
set(simgrid_sources ${simgrid_sources} ${LUA_SRC})
else()
set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC})
set(simgrid_sources ${simgrid_sources} ${LUA_SRC})
else()
set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC})
@@
-946,7
+940,7
@@
set(txt_files
${txt_files}
AUTHORS
COPYING
${txt_files}
AUTHORS
COPYING
- README
+ README
.md
ChangeLog
INSTALL
LICENSE-LGPL-2.1
ChangeLog
INSTALL
LICENSE-LGPL-2.1
@@
-972,6
+966,7
@@
set(CMAKEFILES_TXT
teshsuite/java/CMakeLists.txt
teshsuite/mc/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
teshsuite/java/CMakeLists.txt
teshsuite/mc/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
+ teshsuite/s4u/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simix/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simix/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
@@
-1070,6
+1065,7
@@
set(PLATFORMS_EXAMPLES
examples/platforms/bypassRoute.xml
examples/platforms/cloud.xml
examples/platforms/cluster.xml
examples/platforms/bypassRoute.xml
examples/platforms/cloud.xml
examples/platforms/cluster.xml
+ examples/platforms/cluster_backbone.xml
examples/platforms/cluster_and_one_host.xml
examples/platforms/cluster_prototype.lua
examples/platforms/cluster_no_backbone.xml
examples/platforms/cluster_and_one_host.xml
examples/platforms/cluster_prototype.lua
examples/platforms/cluster_no_backbone.xml
@@
-1126,7
+1122,6
@@
set(PLATFORMS_EXAMPLES
examples/platforms/syscoord/median_meridian.syscoord
examples/platforms/syscoord/median_p2psim.syscoord
examples/platforms/three_multicore_hosts.xml
examples/platforms/syscoord/median_meridian.syscoord
examples/platforms/syscoord/median_p2psim.syscoord
examples/platforms/three_multicore_hosts.xml
- examples/platforms/two_clusters.xml
examples/platforms/two_hosts.xml
examples/platforms/two_hosts_platform_shared.xml
examples/platforms/two_hosts_platform_with_availability.xml
examples/platforms/two_hosts.xml
examples/platforms/two_hosts_platform_shared.xml
examples/platforms/two_hosts_platform_with_availability.xml