From b605a4eb09f9ebb003c8fd4168dc34b8f5e64b09 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 18 Feb 2023 22:48:39 +0100 Subject: [PATCH] kill src/simix --- MANIFEST.in | 2 +- {src/simix => doc}/simix_network.tla | 0 src/{simix/libsmx.cpp => deprecated.cpp} | 0 tools/cmake/DefinePackages.cmake | 122 +++++++++++----------- tools/cmake/Distrib.cmake | 3 +- tools/cmake/Flags.cmake | 2 +- tools/internal/check_dist_archive.exclude | 2 +- 7 files changed, 65 insertions(+), 66 deletions(-) rename {src/simix => doc}/simix_network.tla (100%) rename src/{simix/libsmx.cpp => deprecated.cpp} (100%) diff --git a/MANIFEST.in b/MANIFEST.in index c62529376a..797b9435dd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1968,6 +1968,7 @@ include src/dag/dax.dtd include src/dag/dax_dtd.c include src/dag/dax_dtd.h include src/dag/loaders.cpp +include src/deprecated.cpp include src/instr/instr_config.cpp include src/instr/instr_interface.cpp include src/instr/instr_paje_containers.cpp @@ -2250,7 +2251,6 @@ include src/simgrid/sg_config.cpp include src/simgrid/sg_config.hpp include src/simgrid/sg_version.cpp include src/simgrid/util.hpp -include src/simix/libsmx.cpp include src/smpi/bindings/smpi_f77.cpp include src/smpi/bindings/smpi_f77_coll.cpp include src/smpi/bindings/smpi_f77_comm.cpp diff --git a/src/simix/simix_network.tla b/doc/simix_network.tla similarity index 100% rename from src/simix/simix_network.tla rename to doc/simix_network.tla diff --git a/src/simix/libsmx.cpp b/src/deprecated.cpp similarity index 100% rename from src/simix/libsmx.cpp rename to src/deprecated.cpp diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index c157a750c4..9e411aee61 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -300,10 +300,54 @@ set(NS3_SRC src/kernel/resource/models/ns3/ns3_simulator.cpp ) -set(SURF_SRC +set(KERNEL_SRC + src/deprecated.cpp + src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp + src/kernel/activity/ActivityImpl.cpp + src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/BarrierImpl.cpp + src/kernel/activity/BarrierImpl.hpp + src/kernel/activity/CommImpl.cpp + src/kernel/activity/CommImpl.hpp + src/kernel/activity/ConditionVariableImpl.cpp + src/kernel/activity/ConditionVariableImpl.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/SemaphoreImpl.cpp + src/kernel/activity/SemaphoreImpl.hpp + src/kernel/activity/SleepImpl.cpp + src/kernel/activity/SleepImpl.hpp + src/kernel/activity/Synchro.cpp + src/kernel/activity/Synchro.hpp + + src/kernel/actor/ActorImpl.cpp + src/kernel/actor/ActorImpl.hpp + src/kernel/actor/CommObserver.cpp + src/kernel/actor/CommObserver.hpp + src/kernel/actor/Simcall.cpp + src/kernel/actor/SimcallObserver.cpp + src/kernel/actor/SimcallObserver.hpp + src/kernel/actor/SynchroObserver.cpp + src/kernel/actor/SynchroObserver.hpp + + src/kernel/context/Context.cpp + src/kernel/context/Context.hpp + src/kernel/context/ContextRaw.cpp + src/kernel/context/ContextRaw.hpp + src/kernel/context/ContextSwapped.cpp + src/kernel/context/ContextSwapped.hpp + src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp + src/kernel/lmm/System.cpp src/kernel/lmm/System.hpp src/kernel/lmm/fair_bottleneck.cpp @@ -370,8 +414,8 @@ set(SURF_SRC src/kernel/xml/surfxml_sax_cb.cpp ) if (Eigen3_FOUND) - set(SURF_SRC - ${SURF_SRC} + set(KERNEL_SRC + ${KERNEL_SRC} src/kernel/lmm/bmf.cpp src/kernel/lmm/bmf.hpp) else() @@ -380,6 +424,18 @@ else() src/kernel/lmm/bmf.cpp src/kernel/lmm/bmf.hpp) endif() +# Boost context may not be available +if (HAVE_BOOST_CONTEXTS) + set(KERNEL_SRC + ${KERNEL_SRC} + src/kernel/context/ContextBoost.cpp + src/kernel/context/ContextBoost.hpp) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + src/kernel/context/ContextBoost.cpp + src/kernel/context/ContextBoost.hpp) +endif() set(PLUGINS_SRC src/plugins/ProducerConsumer.cpp @@ -396,61 +452,6 @@ set(PLUGINS_SRC src/plugins/vm/dirty_page_tracking.cpp ) -set(SIMIX_SRC - src/kernel/activity/ActivityImpl.cpp - src/kernel/activity/ActivityImpl.hpp - src/kernel/activity/BarrierImpl.cpp - src/kernel/activity/BarrierImpl.hpp - src/kernel/activity/CommImpl.cpp - src/kernel/activity/CommImpl.hpp - src/kernel/activity/ConditionVariableImpl.cpp - src/kernel/activity/ConditionVariableImpl.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/SemaphoreImpl.cpp - src/kernel/activity/SemaphoreImpl.hpp - src/kernel/activity/SleepImpl.cpp - src/kernel/activity/SleepImpl.hpp - src/kernel/activity/Synchro.cpp - src/kernel/activity/Synchro.hpp - src/kernel/actor/ActorImpl.cpp - src/kernel/actor/ActorImpl.hpp - src/kernel/actor/CommObserver.cpp - src/kernel/actor/CommObserver.hpp - src/kernel/actor/Simcall.cpp - src/kernel/actor/SimcallObserver.cpp - src/kernel/actor/SimcallObserver.hpp - src/kernel/actor/SynchroObserver.cpp - src/kernel/actor/SynchroObserver.hpp - src/kernel/context/Context.cpp - src/kernel/context/Context.hpp - src/kernel/context/ContextRaw.cpp - src/kernel/context/ContextRaw.hpp - src/kernel/context/ContextSwapped.cpp - src/kernel/context/ContextSwapped.hpp - src/kernel/context/ContextThread.cpp - src/kernel/context/ContextThread.hpp - src/simix/libsmx.cpp - ) - -# Boost context may not be available -if (HAVE_BOOST_CONTEXTS) - set(SIMIX_SRC - ${SIMIX_SRC} - src/kernel/context/ContextBoost.cpp - src/kernel/context/ContextBoost.hpp) -else() - set(EXTRA_DIST - ${EXTRA_DIST} - src/kernel/context/ContextBoost.cpp - src/kernel/context/ContextBoost.hpp) -endif() set(S4U_SRC src/s4u/s4u_Activity.cpp @@ -720,7 +721,7 @@ set(source_of_generated_headers ### depend of some variables set upper if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SIMIX_SRC ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp + set(KERNEL_SRC ${KERNEL_SRC} src/kernel/context/ContextUnix.hpp src/kernel/context/ContextUnix.cpp) else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp @@ -732,8 +733,7 @@ set(simgrid_sources ${S4U_SRC} ${SIMGRID_SRC} ${MC_SRC_BASE} - ${SIMIX_SRC} - ${SURF_SRC} + ${KERNEL_SRC} ${TRACING_SRC} ${XBT_SRC} ${PLUGINS_SRC} diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index 61aa173470..10fddafee0 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -86,9 +86,8 @@ set(source_to_pack ${PLUGINS_SRC} ${DAG_SRC} ${SIMGRID_SRC} - ${SIMIX_SRC} ${SMPI_SRC} - ${SURF_SRC} + ${KERNEL_SRC} ${TRACING_SRC} ${XBT_RL_SRC} ${XBT_SRC} diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake index 796fec4290..e482a30f66 100644 --- a/tools/cmake/Flags.cmake +++ b/tools/cmake/Flags.cmake @@ -186,7 +186,7 @@ if(enable_model-checking AND enable_compile_optimizations) # But you can still optimize this: set(src_list ${simgrid_sources}) # except... - list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC}) + list(REMOVE_ITEM src_list ${KERNEL_SRC} ${S4U_SRC}) # but... list(APPEND src_list src/kernel/actor/Simcall.cpp) diff --git a/tools/internal/check_dist_archive.exclude b/tools/internal/check_dist_archive.exclude index eb8674270c..0bf5d2782b 100644 --- a/tools/internal/check_dist_archive.exclude +++ b/tools/internal/check_dist_archive.exclude @@ -32,4 +32,4 @@ + tools/internal/.* + tools/jenkins/.* -+ src/simix/simix_network\.tla ++ doc/simix_network\.tla -- 2.20.1