From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 21 Oct 2015 23:00:23 +0000 (+0200)
Subject: Add missing files -- sorry
X-Git-Tag: v3_13~1635
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cb36c560f1931d47f25b7487b236663f333e40b9

Add missing files -- sorry
---

diff --git a/examples/msg/energy/vm/CMakeLists.txt b/examples/msg/energy/vm/CMakeLists.txt
new file mode 100644
index 0000000000..314be4ce83
--- /dev/null
+++ b/examples/msg/energy/vm/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(energy_vm energy_vm.c)
+
+### Add definitions for compile
+target_link_libraries(energy_vm simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/energy_vm.tesh
+  PARENT_SCOPE
+  )
+
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/energy_vm.c
+  PARENT_SCOPE
+  )
+
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
diff --git a/examples/msg/energy/vm/energy_vm.tesh b/examples/msg/energy/vm/energy_vm.tesh
new file mode 100644
index 0000000000..ce66ee7b33
--- /dev/null
+++ b/examples/msg/energy/vm/energy_vm.tesh
@@ -0,0 +1,23 @@
+#! ./tesh
+
+p Testing the mechanism for computing host energy consumption in case of VMs
+
+$ $SG_TEST_EXENV energy/vm/energy_vm$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:dvfs@MyHost1) Creating and starting two VMs
+> [  0.000000] (0:@) Create VM(vm1)@PM(MyHost1) with 0 mounted disks
+> [  0.000000] (0:@) Create VM(vm2)@PM(MyHost3) with 0 mounted disks
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: one inside a VM, the other directly on the host
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: both directly on the host
+> [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both inside a VM
+> [  0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
+> [  5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The tasks stop at some point in between
+> [  6.000000] (4:p21@MyHost2) This worker is done.
+> [  6.000000] (5:p22@MyHost2) This worker is done.
+> [  6.000000] (3:p12@MyHost1) This worker is done.
+> [  6.000000] (2:p11@vm1) This worker is done.
+> [  6.000000] (6:p31@vm2) This worker is done.
+> [  6.000000] (7:p32@vm2) This worker is done.
+> [ 10.000000] (0:@) Total simulation time: 10.00; All hosts must have the exact same energy consumption.
+> [ 10.000000] (0:@) Total energy of host MyHost1: 1580.000000 Joules
+> [ 10.000000] (0:@) Total energy of host MyHost2: 1600.000000 Joules
+> [ 10.000000] (0:@) Total energy of host MyHost3: 1600.000000 Joules
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 738586658f..06c0d932fc 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1057,6 +1057,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/onoff/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
+  examples/msg/energy/vm/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt