rename an energy example

diff --git a/.gitignore b/.gitignore
index f39dd86..fb32358 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -138,9 +138,9 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
-examples/msg/energy/pstate/pstate
+examples/msg/energy/consumption/energy_consumption
 examples/msg/energy/onoff/onoff
-examples/msg/energy/e2/e2
+examples/msg/energy/pstate/pstate
 examples/msg/energy/e3/e3
 examples/msg/pastry/pastry
 examples/msg/semaphores/synchro

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index a622fd1..ec39e2a 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -234,7 +234,7 @@ IF(NOT enable_memcheck)
   ADD_TESH_FACTORIES(msg-cloud-two-tasks-vm      "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
   ADD_TESH_FACTORIES(msg-cloud-simple-vm         "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   ADD_TESH_FACTORIES(msg-energy-pstates          "thread;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/pstate/pstate.tesh)
-  ADD_TESH_FACTORIES(msg-energy-consumption      "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e2/energy_consumption.tesh)
+  ADD_TESH_FACTORIES(msg-energy-consumption      "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/consumption/energy_consumption.tesh)
   ADD_TESH_FACTORIES(msg-energy-onoff "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/onoff/onoff.tesh)
   ADD_TESH_FACTORIES(msg-energy-concurrent-tasks "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e3/concurrent_tasks.tesh)
   ADD_TESH_FACTORIES(msg-token-ring              "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 49fc2e1..5c653e2 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1029,7 +1029,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
-  examples/msg/energy/e2/CMakeLists.txt
+  examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/e3/CMakeLists.txt
   examples/msg/energy/onoff/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index 4848c99..673c354 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -33,8 +33,8 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/consumption)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/pstate)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e2)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e3)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/onoff)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/exception)

diff --git a/examples/msg/energy/e2/CMakeLists.txt b/examples/msg/energy/consumption/CMakeLists.txt
similarity index 64%
rename from examples/msg/energy/e2/CMakeLists.txt
rename to examples/msg/energy/consumption/CMakeLists.txt
index 28d2e97..c3273d8 100644 (file)
--- a/examples/msg/energy/e2/CMakeLists.txt
+++ b/examples/msg/energy/consumption/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(e2 e2.c)
+add_executable(energy_consumption energy_consumption.c)
 
 ### Add definitions for compile
-target_link_libraries(e2 simgrid )
+target_link_libraries(energy_consumption simgrid)
 
 set(tesh_files
   ${tesh_files}
@@ -15,13 +15,13 @@ set(tesh_files
 
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e2.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_consumption.xml
   PARENT_SCOPE
   )
 
 set(examples_src
   ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/e2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/energy_consumption.c
   PARENT_SCOPE
   )
 

diff --git a/examples/msg/energy/e2/deployment_e2.xml b/examples/msg/energy/consumption/deployment_consumption.xml
similarity index 100%
rename from examples/msg/energy/e2/deployment_e2.xml
rename to examples/msg/energy/consumption/deployment_consumption.xml

diff --git a/examples/msg/energy/e2/e2.c b/examples/msg/energy/consumption/energy_consumption.c
similarity index 100%
rename from examples/msg/energy/e2/e2.c
rename to examples/msg/energy/consumption/energy_consumption.c

diff --git a/examples/msg/energy/e2/energy_consumption.tesh b/examples/msg/energy/consumption/energy_consumption.tesh
similarity index 88%
rename from examples/msg/energy/e2/energy_consumption.tesh
rename to examples/msg/energy/consumption/energy_consumption.tesh
index 8f1e1ce..c5ff2fb 100644 (file)
--- a/examples/msg/energy/e2/energy_consumption.tesh
+++ b/examples/msg/energy/consumption/energy_consumption.tesh
@@ -3,7 +3,7 @@
 p Testing the mechanism for computing host energy consumption
 
 ! output sort
-$ $SG_TEST_EXENV energy/e2/e2$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/e2/deployment_e2.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/consumption/deployment_consumption.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 95.0:200.0, 93.0:170.0, 90.0:150.0
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds