From: Martin Quinson Date: Wed, 16 Nov 2016 22:19:35 +0000 (+0100) Subject: move virtual machines to the directory src/plugins/vm X-Git-Tag: v3_14~189 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8fda7faea52d55ca15ff084a64029b2a63e2f720 move virtual machines to the directory src/plugins/vm --- diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 8c5a0803cb..177b776444 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -11,7 +11,7 @@ #include -#include "src/surf/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include #include diff --git a/src/surf/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp similarity index 98% rename from src/surf/VirtualMachineImpl.cpp rename to src/plugins/vm/VirtualMachineImpl.cpp index 97b5613bdb..5b03ca6fa5 100644 --- a/src/surf/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -4,12 +4,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/surf/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "simgrid/s4u/VirtualMachine.hpp" #include -#include "cpu_cas01.hpp" +#include "src/surf/cpu_cas01.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -140,7 +140,7 @@ VirtualMachineImpl::~VirtualMachineImpl() allVms_.erase(find(allVms_.begin(), allVms_.end(), this)); /* dirty page tracking */ - unsigned int size = xbt_dict_size(dp_objs); + unsigned int size = xbt_dict_size(dp_objs); static bool already_warned = false; if (size > 0 && !already_warned) { xbt_dict_cursor_t cursor = nullptr; diff --git a/src/surf/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp similarity index 100% rename from src/surf/VirtualMachineImpl.hpp rename to src/plugins/vm/VirtualMachineImpl.hpp diff --git a/src/surf/VmHostExt.cpp b/src/plugins/vm/VmHostExt.cpp similarity index 90% rename from src/surf/VmHostExt.cpp rename to src/plugins/vm/VmHostExt.cpp index a79060e73e..a4fcf09ece 100644 --- a/src/surf/VmHostExt.cpp +++ b/src/plugins/vm/VmHostExt.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/surf/VmHostExt.hpp" +#include "src/plugins/vm/VmHostExt.hpp" XBT_LOG_EXTERNAL_CATEGORY(surf_vm); XBT_LOG_DEFAULT_CATEGORY(surf_vm); diff --git a/src/surf/VmHostExt.hpp b/src/plugins/vm/VmHostExt.hpp similarity index 100% rename from src/surf/VmHostExt.hpp rename to src/plugins/vm/VmHostExt.hpp diff --git a/src/s4u/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp similarity index 96% rename from src/s4u/s4u_VirtualMachine.cpp rename to src/plugins/vm/s4u_VirtualMachine.cpp index d6d976e38c..1ea75da957 100644 --- a/src/s4u/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -7,8 +7,8 @@ #include "simgrid/s4u/VirtualMachine.hpp" #include "simgrid/s4u/host.hpp" #include "simgrid/simix.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/VirtualMachineImpl.hpp" #include "xbt/asserts.h" namespace simgrid { diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 4686b80115..14d822610d 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -25,8 +25,8 @@ #include "src/kernel/activity/SynchroComm.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.h" -#include "src/surf/VirtualMachineImpl.hpp" #include "xbt/ex.h" #include diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index b7ff8a58c8..cc6e2824a7 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -7,8 +7,8 @@ #include "mc/mc.h" #include "smx_private.h" #include "src/mc/mc_replay.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/VirtualMachineImpl.hpp" #include "xbt/sysdep.h" #include diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp index 2866042664..2866b91b4b 100644 --- a/src/simix/smx_vm.cpp +++ b/src/simix/smx_vm.cpp @@ -6,8 +6,8 @@ #include "mc/mc.h" #include "simgrid/s4u/VirtualMachine.hpp" #include "smx_private.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/VirtualMachineImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virtual Machines"); diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 2943b4de73..52dcdbcba8 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -10,8 +10,8 @@ #include "src/surf/HostImpl.hpp" #include "simgrid/sg_config.h" -#include "VirtualMachineImpl.hpp" #include "network_interface.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index a60b0bf526..7a4686e6bf 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -10,7 +10,6 @@ #include "host_clm03.hpp" -#include "VirtualMachineImpl.hpp" #include "cpu_cas01.hpp" #include "simgrid/sg_config.h" diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index b76c9132a2..d0d1d32f71 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -5,7 +5,7 @@ #include "simgrid/plugins/energy.h" #include "simgrid/simix.hpp" -#include "src/surf/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/plugins/energy.hpp" #include diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 3b323f77ac..3870fa870f 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,11 +4,11 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "VirtualMachineImpl.hpp" -#include "network_interface.hpp" #include "plugins/energy.hpp" #include "src/instr/instr_private.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" +#include "src/surf/network_interface.hpp" #include "surf_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 24577afe5d..01bc6f0f6a 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "surf_interface.hpp" -#include "VirtualMachineImpl.hpp" #include "cpu_interface.hpp" #include "mc/mc.h" #include "network_interface.hpp" diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b95d9cf067..87152e44ba 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -81,8 +81,6 @@ set(EXTRA_DIST src/surf/surf_private.h src/surf/surf_routing.hpp src/surf/PropertyHolder.hpp - src/surf/VirtualMachineImpl.hpp - src/surf/VmHostExt.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -333,13 +331,19 @@ set(SURF_SRC src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp - src/surf/VirtualMachineImpl.cpp - src/surf/VmHostExt.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp ) +set(PLUGINS_SRC + src/plugins/vm/s4u_VirtualMachine.cpp + src/plugins/vm/VirtualMachineImpl.hpp + src/plugins/vm/VirtualMachineImpl.cpp + src/plugins/vm/VmHostExt.hpp + src/plugins/vm/VmHostExt.cpp + ) + set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC src/kernel/future.cpp @@ -393,7 +397,6 @@ set(S4U_SRC src/s4u/s4u_mutex.cpp src/s4u/s4u_conditionVariable.cpp src/s4u/s4u_storage.cpp - src/s4u/s4u_VirtualMachine.cpp ) set(SIMGRID_SRC @@ -744,6 +747,7 @@ endif() ### Simgrid Lib sources set(simgrid_sources + ${PLUGINS_SRC} ${BINDINGS_SRC} ${MC_SRC_BASE} ${MSG_SRC}