Merge branch 'chiller-plugin' into 'master'

Chiller plugin

See merge request simgrid/simgrid!172

diff --combined MANIFEST.in
index ef8d95cb2fd2020ea8397346610935d4265c902c,7998d133ce6dc40cbdcfe7ed5658da8a8f8d003d..2e42447676dc59ad2b6fe5139fc96b021ccfc9af
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -173,6 -173,8 +173,8 @@@ include examples/cpp/battery-energy/s4u
  include examples/cpp/battery-energy/s4u-battery-energy.tesh
  include examples/cpp/battery-simple/s4u-battery-simple.cpp
  include examples/cpp/battery-simple/s4u-battery-simple.tesh
+ include examples/cpp/chiller-simple/s4u-chiller-simple.cpp
+ include examples/cpp/chiller-simple/s4u-chiller-simple.tesh
  include examples/cpp/cloud-capping/s4u-cloud-capping.cpp
  include examples/cpp/cloud-capping/s4u-cloud-capping.tesh
  include examples/cpp/cloud-migration/s4u-cloud-migration.cpp
@@@ -394,10 -396,6 +396,10 @@@ include examples/cpp/synchro-semaphore/
  include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh
  include examples/cpp/task-io/s4u-task-io.cpp
  include examples/cpp/task-io/s4u-task-io.tesh
 +include examples/cpp/task-microservice/s4u-task-microservice.cpp
 +include examples/cpp/task-microservice/s4u-task-microservice.tesh
 +include examples/cpp/task-parallelism/s4u-task-parallelism.cpp
 +include examples/cpp/task-parallelism/s4u-task-parallelism.tesh
  include examples/cpp/task-simple/s4u-task-simple.cpp
  include examples/cpp/task-simple/s4u-task-simple.tesh
  include examples/cpp/task-storm/s4u-task-storm.cpp
@@@ -1940,6 -1938,7 +1942,7 @@@ include include/simgrid/modelchecker.
  include include/simgrid/mutex.h
  include include/simgrid/plugins/ProducerConsumer.hpp
  include include/simgrid/plugins/battery.hpp
+ include include/simgrid/plugins/chiller.hpp
  include include/simgrid/plugins/dvfs.h
  include include/simgrid/plugins/energy.h
  include include/simgrid/plugins/file_system.h
@@@ -2316,6 -2315,7 +2319,7 @@@ include src/mc/transition/TransitionSyn
  include src/plugins/ProducerConsumer.cpp
  include src/plugins/battery.cpp
  include src/plugins/chaos_monkey.cpp
+ include src/plugins/chiller.cpp
  include src/plugins/file_system/s4u_FileSystem.cpp
  include src/plugins/host_dvfs.cpp
  include src/plugins/host_energy.cpp

diff --combined examples/cpp/CMakeLists.txt
index 8d35473c1630430a6c6797e92320a05e7ed116f9,b0a2026034934352a233be043212bb4fadc6ca69..f46d58b147219bb72ea3002b3129eb8330e810f4
--- 1/examples/cpp/CMakeLists.txt
--- 2/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -158,6 -158,7 +158,7 @@@ foreach (example activityset-testany ac
                   actor-lifetime actor-migrate actor-suspend actor-yield actor-stacksize
                   app-bittorrent app-chainsend app-token-ring
                   battery-degradation battery-simple battery-energy
+                  chiller-simple
                   comm-pingpong comm-ready comm-suspend comm-wait comm-waituntil
                   comm-dependent comm-host2host comm-failure comm-throttling
                   cloud-capping cloud-migration cloud-simple
@@@ -171,7 -172,7 +172,7 @@@
                   mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
                   network-ns3 network-ns3-wifi network-wifi
                   io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent
 -                 task-io task-simple task-variable-load task-storm task-switch-host
 +                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load
                   photovoltaic-simple
                   platform-comm-serialize platform-failures platform-profile platform-properties
                   plugin-host-load plugin-jbod plugin-link-load plugin-prodcons