Merge branch 'master' into 'photovoltaic-revamp'

# Conflicts:
#   examples/cpp/CMakeLists.txt
#   tools/cmake/DefinePackages.cmake

diff --combined ChangeLog
index 26cdda0,77b01a3..a39a236
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -27,6 -27,8 +27,8 @@@ C API
  Plugins:
   - Revamp the battery plugin: rewrite completely the API, for a better usability.
     The examples were updated accordingly.
+  - Add chiller plugin: enable the management of chillers consuming electrical energy
+    to compensate heat generated by hosts.
  
  ----------------------------------------------------------------------------
  
@@@ -72,8 -74,8 +74,8 @@@ S4U
  New S4U plugins:
   - Battery: Enable the management of batteries on hosts.
     See the examples under examples/cpp/battery-* and the documentation in the Plugins page.
 - - Photovoltaic: Enable the management of photovoltaic panels on hosts.
 -   See the examples under examples/cpp/photovoltaic-* and the documentation in the Plugins page.
 + - SolarPanel: Enable the management of solar panels.
 +   See the examples under examples/cpp/solar-panel-* and the documentation in the Plugins page.
  
  Kernel:
   - optimize an internal data structure (use a set instead of a list for ongoing activities),

diff --combined MANIFEST.in
index 493259a,2e42447..d33f19f
--- 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
@@@ -346,8 -348,8 +348,8 @@@ include examples/cpp/network-ns3/s4u-ne
  include examples/cpp/network-ns3/s4u-network-ns3.cpp
  include examples/cpp/network-wifi/s4u-network-wifi.cpp
  include examples/cpp/network-wifi/s4u-network-wifi.tesh
 -include examples/cpp/photovoltaic-simple/s4u-photovoltaic-simple.cpp
 -include examples/cpp/photovoltaic-simple/s4u-photovoltaic-simple.tesh
 +include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.cpp
 +include examples/cpp/solar-panel-simple/s4u-solar-panel-simple.tesh
  include examples/cpp/platform-comm-serialize/s4u-platform-comm-serialize.cpp
  include examples/cpp/platform-comm-serialize/s4u-platform-comm-serialize.tesh
  include examples/cpp/platform-failures/s4u-platform-failures.cpp
@@@ -394,6 -396,10 +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
@@@ -1841,6 -1847,7 +1847,6 @@@ include examples/platforms/onelink.xm
  include examples/platforms/optorsim/gridpp_grid_2004.conf
  include examples/platforms/optorsim/lcg_sept2004_grid.conf
  include examples/platforms/optorsim/transform_optorsim_platform.pl
 -include examples/platforms/photovoltaic_platform.xml
  include examples/platforms/profiles/fafard_state.profile
  include examples/platforms/profiles/faulty_host.profile
  include examples/platforms/profiles/ginette_state.profile
@@@ -1935,6 -1942,7 +1941,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
@@@ -1942,7 -1950,7 +1949,7 @@@ include include/simgrid/plugins/jbod.hp
  include include/simgrid/plugins/live_migration.h
  include include/simgrid/plugins/load.h
  include include/simgrid/plugins/ns3.hpp
 -include include/simgrid/plugins/photovoltaic.hpp
 +include include/simgrid/plugins/solar_panel.hpp
  include include/simgrid/s4u.hpp
  include include/simgrid/s4u/Activity.hpp
  include include/simgrid/s4u/ActivitySet.hpp
@@@ -2311,6 -2319,7 +2318,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
@@@ -2319,7 -2328,7 +2327,7 @@@ include src/plugins/jbod.cp
  include src/plugins/link_energy.cpp
  include src/plugins/link_energy_wifi.cpp
  include src/plugins/link_load.cpp
 -include src/plugins/photovoltaic.cpp
 +include src/plugins/solar_panel.cpp
  include src/plugins/vm/VmLiveMigration.cpp
  include src/plugins/vm/VmLiveMigration.hpp
  include src/plugins/vm/dirty_page_tracking.cpp

diff --combined docs/source/Plugins.rst
index 003b81f,87ba3a8..683bb4f
--- 1/docs/source/Plugins.rst
--- 2/docs/source/Plugins.rst
+++ b/docs/source/Plugins.rst
@@@ -24,7 -24,7 +24,7 @@@ documents some of the plugins distribut
    - :ref:`Link Energy <plugin_link_energy>`: models the energy dissipation of the network.
    - :ref:`WiFi Energy <plugin_link_energy_wifi>`: models the energy dissipation of wifi links.
    - :ref:`Battery <plugin_battery>`: models batteries that get discharged by the energy consumption of a given host.
 -  - :ref:`Photovoltaic <plugin_photovoltaic>`: models photovoltaic panels which energy production depends on the solar irradiance.
 +  - :ref:`Solar Panel <plugin_solar_panel>`: models solar panels which energy production depends on the solar irradiance.
  
  You can activate these plugins with the :ref:`--cfg=plugin <cfg=plugin>` command
  line option, for example with ``--cfg=plugin:host_energy``. You can get the full
@@@ -224,11 -224,16 +224,16 @@@ Batter
  
  .. doxygengroup:: plugin_battery
  
 -.. _plugin_photovoltaic:
 +.. _plugin_solar_panel:
  
 -Photovoltaic
 +Solar Panel
  ===========
  
 -.. doxygengroup:: plugin_photovoltaic
 +.. doxygengroup:: plugin_solar_panel
  
+ Chiller
+ ===========
+ 
+ .. doxygengroup:: plugin_chiller
+ 
  ..  LocalWords:  SimGrid

diff --combined examples/cpp/CMakeLists.txt
index 4907fdf,f46d58b..2ddf038
--- 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,8 -172,8 +172,8 @@@
                   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
++                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load 
 +                 solar-panel-simple
                   platform-comm-serialize platform-failures platform-profile platform-properties
                   plugin-host-load plugin-jbod plugin-link-load plugin-prodcons
                   replay-comm replay-io

diff --combined tools/cmake/DefinePackages.cmake
index 267162f,59ef88e..cee3e25
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -453,7 -453,8 +453,8 @@@ set(PLUGINS_SR
    src/plugins/vm/VmLiveMigration.hpp
    src/plugins/vm/dirty_page_tracking.cpp
    src/plugins/battery.cpp
 -  src/plugins/photovoltaic.cpp
+   src/plugins/chiller.cpp
 +  src/plugins/solar_panel.cpp
    )
  
  
@@@ -657,13 -658,14 +658,14 @@@ set(headers_to_instal
    include/simgrid/Exception.hpp
    include/simgrid/chrono.hpp
    include/simgrid/plugins/battery.hpp
+   include/simgrid/plugins/chiller.hpp
    include/simgrid/plugins/dvfs.h
    include/simgrid/plugins/energy.h
    include/simgrid/plugins/file_system.h
    include/simgrid/plugins/jbod.hpp
    include/simgrid/plugins/live_migration.h
    include/simgrid/plugins/load.h
 -  include/simgrid/plugins/photovoltaic.hpp
 +  include/simgrid/plugins/solar_panel.hpp
    include/simgrid/plugins/ProducerConsumer.hpp
    include/simgrid/instr.h
    include/simgrid/mailbox.h
@@@ -1141,6 -1143,7 +1143,6 @@@ set(PLATFORMS_EXAMPLE
    examples/platforms/optorsim/gridpp_grid_2004.conf
    examples/platforms/optorsim/lcg_sept2004_grid.conf
    examples/platforms/optorsim/transform_optorsim_platform.pl
 -  examples/platforms/photovoltaic_platform.xml
    examples/platforms/profiles/fafard_state.profile
    examples/platforms/profiles/faulty_host.profile
    examples/platforms/profiles/ginette_state.profile