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
sort Context files
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index
683a623
..
1ea2fac
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-32,6
+32,12
@@
set(EXTRA_DIST
src/simix/smx_private.hpp
src/simix/smx_process_private.h
src/simix/smx_synchro_private.h
src/simix/smx_private.hpp
src/simix/smx_process_private.h
src/simix/smx_synchro_private.h
+ src/simix/Synchro.h
+ src/simix/SynchroComm.hpp
+ src/simix/SynchroExec.hpp
+ src/simix/SynchroIo.hpp
+ src/simix/SynchroSleep.hpp
+ src/simix/SynchroRaw.hpp
src/smpi/README
src/smpi/colls/coll_tuned_topo.h
src/smpi/colls/colls.h
src/smpi/README
src/smpi/colls/coll_tuned_topo.h
src/smpi/colls/colls.h
@@
-270,20
+276,14
@@
set(XBT_SRC
src/xbt/xbt_strbuff.c
src/xbt/xbt_virtu.c
src/xbt_modinter.h
src/xbt/xbt_strbuff.c
src/xbt/xbt_virtu.c
src/xbt_modinter.h
-
)
if(HAVE_MMALLOC)
)
if(HAVE_MMALLOC)
- set(XBT_SRC
- ${XBT_SRC}
- src/xbt/mmalloc/mm.c
- )
+ set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c )
endif()
endif()
-set(NS3_SRC
- src/surf/network_ns3.cpp
- src/surf/ns3/ns3_simulator.cc
- )
+set(NS3_SRC src/surf/network_ns3.cpp
+ src/surf/ns3/ns3_simulator.cc )
set(SURF_SRC
src/surf/AsImpl.cpp
set(SURF_SRC
src/surf/AsImpl.cpp
@@
-331,13
+331,12
@@
set(SURF_SRC
src/surf/ptask_L07.cpp
)
src/surf/ptask_L07.cpp
)
-set(SIMIX_GENERATED_SRC
- src/simix/popping_generated.cpp
- )
+set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp )
set(SIMIX_SRC
src/simix/libsmx.cpp
src/simix/smx_context.cpp
src/simix/Context.cpp
set(SIMIX_SRC
src/simix/libsmx.cpp
src/simix/smx_context.cpp
src/simix/Context.cpp
+ src/simix/ContextRaw.cpp
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
@@
-348,32
+347,27
@@
set(SIMIX_SRC
src/simix/smx_synchro.cpp
src/simix/smx_vm.cpp
src/simix/popping.cpp
src/simix/smx_synchro.cpp
src/simix/smx_vm.cpp
src/simix/popping.cpp
-
+ src/simix/Synchro.cpp
+ src/simix/SynchroComm.cpp
+ src/simix/SynchroExec.cpp
+ src/simix/SynchroSleep.cpp
+ src/simix/SynchroRaw.cpp
+ src/simix/SynchroIo.cpp
+
${SIMIX_GENERATED_SRC}
)
${SIMIX_GENERATED_SRC}
)
-# Don't try to compile our inline assembly with MSVC
-if (MSVC)
- set(EXTRA_DIST
- ${EXTRA_DIST}
- src/simix/RawContext.cpp)
-else()
- set(SIMIX_SRC
- ${SIMIX_SRC}
- src/simix/RawContext.cpp)
-endif()
-
# Boost context may not be available
if (HAVE_BOOST_CONTEXTS)
set(SIMIX_SRC
${SIMIX_SRC}
# Boost context may not be available
if (HAVE_BOOST_CONTEXTS)
set(SIMIX_SRC
${SIMIX_SRC}
- src/simix/
BoostContex
t.hpp
- src/simix/
BoostContex
t.cpp)
+ src/simix/
ContextBoos
t.hpp
+ src/simix/
ContextBoos
t.cpp)
else()
set(EXTRA_DIST
${EXTRA_DIST}
else()
set(EXTRA_DIST
${EXTRA_DIST}
- src/simix/
BoostContex
t.hpp
- src/simix/
BoostContex
t.cpp)
+ src/simix/
ContextBoos
t.hpp
+ src/simix/
ContextBoos
t.cpp)
endif()
set(S4U_SRC
endif()
set(S4U_SRC
@@
-581,8
+575,7
@@
set(MC_SRC
src/mc/mc_page_snapshot.cpp
src/mc/mc_comm_pattern.h
src/mc/mc_comm_pattern.cpp
src/mc/mc_page_snapshot.cpp
src/mc/mc_comm_pattern.h
src/mc/mc_comm_pattern.cpp
- src/mc/mc_compare.cpp
- src/mc/mc_diff.cpp
+ src/mc/compare.cpp
src/mc/mc_dwarf.hpp
src/mc/mc_dwarf.cpp
src/mc/mc_dwarf_attrnames.cpp
src/mc/mc_dwarf.hpp
src/mc/mc_dwarf.cpp
src/mc/mc_dwarf_attrnames.cpp
@@
-595,7
+588,6
@@
set(MC_SRC
src/mc/mc_mmalloc.h
src/mc/LivenessChecker.hpp
src/mc/LocationList.hpp
src/mc/mc_mmalloc.h
src/mc/LivenessChecker.hpp
src/mc/LocationList.hpp
- src/mc/malloc.hpp
src/mc/LocationList.cpp
src/mc/LivenessChecker.cpp
src/mc/mc_record.cpp
src/mc/LocationList.cpp
src/mc/LivenessChecker.cpp
src/mc/mc_record.cpp
@@
-620,8
+612,7
@@
set(MC_SRC
src/mc/Transition.hpp
)
src/mc/Transition.hpp
)
-set(MC_SIMGRID_MC_SRC
- src/mc/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp)
set(headers_to_install
include/msg/msg.h
set(headers_to_install
include/msg/msg.h
@@
-708,14
+699,14
@@
set(source_of_generated_headers
if(${HAVE_THREAD_CONTEXTS}) #pthread
set(SURF_SRC
${SURF_SRC}
if(${HAVE_THREAD_CONTEXTS}) #pthread
set(SURF_SRC
${SURF_SRC}
- src/simix/
ThreadContext
.cpp
- src/simix/
ThreadContext
.hpp
+ src/simix/
ContextThread
.cpp
+ src/simix/
ContextThread
.hpp
)
else() # NOT pthread
set(EXTRA_DIST
${EXTRA_DIST}
)
else() # NOT pthread
set(EXTRA_DIST
${EXTRA_DIST}
- src/simix/
ThreadContext
.cpp
- src/simix/
ThreadContext
.hpp
+ src/simix/
ContextThread
.cpp
+ src/simix/
ContextThread
.hpp
)
endif()
)
endif()
@@
-727,9
+718,9
@@
else() # NOT pthread
endif()
if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
endif()
if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
- set(SURF_SRC ${SURF_SRC} src/simix/
UContext
.cpp)
+ set(SURF_SRC ${SURF_SRC} src/simix/
ContextUnix
.cpp)
else() # NOT ucontext
else() # NOT ucontext
- set(EXTRA_DIST ${EXTRA_DIST} src/simix/
UContext
.cpp)
+ set(EXTRA_DIST ${EXTRA_DIST} src/simix/
ContextUnix
.cpp)
endif()
### Simgrid Lib sources
endif()
### Simgrid Lib sources
@@
-768,8
+759,8
@@
endif()
if(WIN32)
set(simgrid_sources
${simgrid_sources}
if(WIN32)
set(simgrid_sources
${simgrid_sources}
- src/simix/
ThreadContext
.cpp
- src/simix/
ThreadContext
.hpp
+ src/simix/
ContextThread
.cpp
+ src/simix/
ContextThread
.hpp
src/xbt/xbt_os_thread.c
)
endif()
src/xbt/xbt_os_thread.c
)
endif()
@@
-873,7
+864,6
@@
set(DOC_IMG
${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
- ${CMAKE_HOME_DIRECTORY}/doc/webcruft/DiscoveringSimgrid.gif
${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png