From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 2 Dec 2017 21:01:28 +0000 (+0100)
Subject: Merge branch 'energy-pstate' of https://github.com/Takishipp/simgrid into Takishipp... 
X-Git-Tag: v3.18~180^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/02fbf5e463830a439464adae8626cd4f2dad27fd

Merge branch 'energy-pstate' of https://github.com/Takishipp/simgrid into Takishipp-energy-pstate
---

02fbf5e463830a439464adae8626cd4f2dad27fd
diff --cc examples/s4u/CMakeLists.txt
index 1a699a2c92,2cd0fbac7d..1a15301d46
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -1,10 -1,9 +1,10 @@@
  foreach (example actions-comm actions-storage 
                   actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield
 -                 app-masterworker app-pingpong app-token-ring energy-pstate
 -		 async-wait async-waitany async-waitall
 -		 energy-link
 -		 plugin-hostload io mutex)
 +                 app-masterworker app-pingpong app-token-ring
 +                 async-wait async-waitany async-waitall
-                  energy-link energy-ptask
++                 energy-link energy-pstate energy-ptask
 +                 io io-file-remote io-storage-raw
 +                 platform-properties plugin-hostload mutex)
    add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
    target_link_libraries(s4u-${example}  simgrid)
    set_target_properties(s4u-${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
@@@ -66,15 -65,10 +68,15 @@@ set(txt_files     ${txt_files}    ${CMA
  
  foreach(example actions-comm actions-storage 
                  actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield
 -                app-bittorrent app-masterworker app-pingpong app-token-ring energy-pstate
 -		async-wait async-waitall async-waitany
 -		dht-chord 
 -		energy-link
 -		plugin-hostload io mutex)
 -  ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u-${example}.tesh)
 +                app-bittorrent app-masterworker app-pingpong app-token-ring 
 +                async-wait async-waitall async-waitany
 +                dht-chord 
-                 energy-link energy-ptask
++                energy-link energy-pstate energy-ptask
 +                platform-properties plugin-hostload mutex
 +                io io-file-remote io-storage-raw)
 +  ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" 
 +                                    --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} 
 +				    --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
 +				    --cd ${CMAKE_CURRENT_BINARY_DIR}/${example} 
 +				    ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh)
  endforeach()
diff --cc examples/s4u/energy-pstate/s4u-energy-pstate.tesh
index 0000000000,6a2e59374e..75de0f9793
mode 000000,100644..100644
--- a/examples/s4u/energy-pstate/s4u-energy-pstate.tesh
+++ b/examples/s4u/energy-pstate/s4u-energy-pstate.tesh
@@@ -1,0 -1,41 +1,41 @@@
+ #! ./tesh
+ 
+ p Testing the DVFS-related functions
+ 
 -$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+ > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+ > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
+ > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
+ > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
+ > [  1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00
+ > [  1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00
+ > [  1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2)
+ > [  1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2)
+ > [  1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
+ > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
+ > [  6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00
+ > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+ > [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
+ > [  6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00
+ > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
+ > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
+ > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00
+ 
 -$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/s4u-energy-pstate$EXEEXT ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+ > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+ > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
+ > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
+ > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
+ > [  1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00
+ > [  1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00
+ > [  1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2)
+ > [  1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2)
+ > [  1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
+ > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
+ > [  6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00
+ > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+ > [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
+ > [  6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00
+ > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
+ > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
+ > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00
diff --cc teshsuite/msg/actions-comm/actions-comm.tesh
index d2833bb3b3,d2833bb3b3..22108dca64
--- a/teshsuite/msg/actions-comm/actions-comm.tesh
+++ b/teshsuite/msg/actions-comm/actions-comm.tesh
@@@ -1,5 -1,5 +1,5 @@@
  ! output sort 19
--$ ${bindir:=.}/actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml actions-comm_split_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/actions-comm --log=actions.thres=verbose ${platfdir}/small_platform_fatpipe.xml actions-comm_split_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
  > [ 20.703314] (1:p0@Tremblay) p0 recv p1 20.703314
  > [ 20.703314] (2:p1@Ruby) p1 send p0 1e10 20.703314
  > [ 30.897513] (0:maestro@) Simulation time 30.8975
@@@ -7,7 -7,7 +7,7 @@@
  > [ 30.897513] (2:p1@Ruby) p1 compute 1e9 10.194200
  
  ! output sort 19
--$ ${bindir:=.}/actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml actions-comm_d.xml actions-comm.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/actions-comm --log=actions.thres=verbose ${platfdir}/small_platform_fatpipe.xml actions-comm_d.xml actions-comm.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
  > [  0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000
  > [  1.037020] (1:p0@Tremblay) p0 bcast 5e8 1.037020
  > [  1.037020] (2:p1@Ruby) p1 bcast 5e8 1.037020
diff --cc teshsuite/msg/actions-storage/actions-storage.tesh
index e8219a17ea,e8219a17ea..d9a69ee146
--- a/teshsuite/msg/actions-storage/actions-storage.tesh
+++ b/teshsuite/msg/actions-storage/actions-storage.tesh
@@@ -1,5 -1,5 +1,5 @@@
  ! output sort 19
--$ ${bindir:=.}/actions-storage --log=storage_actions.thres=verbose ${srcdir:=.}/storage/storage.xml actions-storage_d.xml actions-storage.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/actions-storage --log=storage_actions.thres=verbose ${platfdir}/storage/storage.xml actions-storage_d.xml actions-storage.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
  > [  0.000000] (1:p0@denise) p0 open /home/lib/libsimgrid.so.3.6.2 0.000000
  > [  0.063552] (1:p0@denise) p0 read /home/lib/libsimgrid.so.3.6.2 12710497 0.063552
  > [  0.063552] (1:p0@denise) p0 close /home/lib/libsimgrid.so.3.6.2 0.000000
diff --cc teshsuite/msg/app-bittorrent/app-bittorrent.tesh
index 262fce3ae9,262fce3ae9..09080213d4
--- a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
+++ b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
@@@ -4,7 -4,7 +4,7 @@@ p Testing the Bittorrent implementatio
  
  ! timeout 10
  ! output sort 19
--$ ${bindir:=.}/bittorrent ${srcdir:=.}/cluster.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
++$ ${bindir:=.}/bittorrent ${platfdir}/cluster.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
  > [    0.000000] (1:tracker@node-0.acme.org) Tracker launched.
  > [    0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2
  > [    0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3