Merge branch 'odpor-implementation' into 'master'

Introduce SDPOR and ODPOR into Simgrid

See merge request simgrid/simgrid!154

diff --combined MANIFEST.in
index f4fe53a,af013f6..1fa074d
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -350,16 -350,12 +350,16 @@@ 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/operation-io/s4u-operation-io.cpp
 +include examples/cpp/operation-io/s4u-operation-io.tesh
  include examples/cpp/operation-simple/s4u-operation-simple.cpp
  include examples/cpp/operation-simple/s4u-operation-simple.tesh
  include examples/cpp/operation-switch-host/s4u-operation-switch-host.cpp
  include examples/cpp/operation-switch-host/s4u-operation-switch-host.tesh
  include examples/cpp/operation-variable-load/s4u-operation-variable-load.cpp
  include examples/cpp/operation-variable-load/s4u-operation-variable-load.tesh
 +include examples/cpp/photovoltaic-simple/s4u-photovoltaic-simple.cpp
 +include examples/cpp/photovoltaic-simple/s4u-photovoltaic-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
@@@ -476,14 -472,6 +476,14 @@@ include examples/python/io-degradation/
  include examples/python/io-degradation/io-degradation.tesh
  include examples/python/network-nonlinear/network-nonlinear.py
  include examples/python/network-nonlinear/network-nonlinear.tesh
 +include examples/python/operation-io/operation-io.py
 +include examples/python/operation-io/operation-io.tesh
 +include examples/python/operation-simple/operation-simple.py
 +include examples/python/operation-simple/operation-simple.tesh
 +include examples/python/operation-switch-host/operation-switch-host.py
 +include examples/python/operation-switch-host/operation-switch-host.tesh
 +include examples/python/operation-variable-load/operation-variable-load.py
 +include examples/python/operation-variable-load/operation-variable-load.tesh
  include examples/python/platform-comm-serialize/platform-comm-serialize.py
  include examples/python/platform-comm-serialize/platform-comm-serialize.tesh
  include examples/python/platform-failures/platform-failures.py
@@@ -1844,7 -1832,6 +1844,7 @@@ 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
@@@ -1945,7 -1932,6 +1945,7 @@@ include include/simgrid/plugins/live_mi
  include include/simgrid/plugins/load.h
  include include/simgrid/plugins/ns3.hpp
  include include/simgrid/plugins/operation.hpp
 +include include/simgrid/plugins/photovoltaic.hpp
  include include/simgrid/s4u.hpp
  include include/simgrid/s4u/Activity.hpp
  include include/simgrid/s4u/Actor.hpp
@@@ -2185,6 -2171,8 +2185,8 @@@ include src/mc/AddressSpace.hp
  include src/mc/VisitedState.cpp
  include src/mc/VisitedState.hpp
  include src/mc/api/ActorState.hpp
+ include src/mc/api/ClockVector.cpp
+ include src/mc/api/ClockVector.hpp
  include src/mc/api/RemoteApp.cpp
  include src/mc/api/RemoteApp.hpp
  include src/mc/api/State.cpp
@@@ -2203,6 -2191,19 +2205,19 @@@ include src/mc/explo/LivenessChecker.cp
  include src/mc/explo/LivenessChecker.hpp
  include src/mc/explo/UdporChecker.cpp
  include src/mc/explo/UdporChecker.hpp
+ include src/mc/explo/odpor/ClockVector_test.cpp
+ include src/mc/explo/odpor/Execution.cpp
+ include src/mc/explo/odpor/Execution.hpp
+ include src/mc/explo/odpor/Execution_test.cpp
+ include src/mc/explo/odpor/ReversibleRaceCalculator.cpp
+ include src/mc/explo/odpor/ReversibleRaceCalculator.hpp
+ include src/mc/explo/odpor/WakeupTree.cpp
+ include src/mc/explo/odpor/WakeupTree.hpp
+ include src/mc/explo/odpor/WakeupTreeIterator.cpp
+ include src/mc/explo/odpor/WakeupTreeIterator.hpp
+ include src/mc/explo/odpor/WakeupTree_test.cpp
+ include src/mc/explo/odpor/odpor_forward.hpp
+ include src/mc/explo/odpor/odpor_tests_private.hpp
  include src/mc/explo/simgrid_mc.cpp
  include src/mc/explo/udpor/Comb.hpp
  include src/mc/explo/udpor/Configuration.cpp
@@@ -2304,7 -2305,6 +2319,7 @@@ include src/plugins/link_energy.cp
  include src/plugins/link_energy_wifi.cpp
  include src/plugins/link_load.cpp
  include src/plugins/operation.cpp
 +include src/plugins/photovoltaic.cpp
  include src/plugins/vm/VmLiveMigration.cpp
  include src/plugins/vm/VmLiveMigration.hpp
  include src/plugins/vm/dirty_page_tracking.cpp

diff --combined tools/cmake/DefinePackages.cmake
index d6d2a5b,51fb099..fc80edc
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -455,7 -455,6 +455,7 @@@ set(PLUGINS_SR
    src/plugins/vm/dirty_page_tracking.cpp
    src/plugins/battery.cpp
    src/plugins/operation.cpp
 +  src/plugins/photovoltaic.cpp
    )
  
  
@@@ -524,6 -523,8 +524,8 @@@ set(MC_SRC_BAS
    
  set(MC_SRC_STATELESS
    src/mc/api/ActorState.hpp
+   src/mc/api/ClockVector.cpp
+   src/mc/api/ClockVector.hpp
    src/mc/api/State.cpp
    src/mc/api/State.hpp
    src/mc/api/RemoteApp.cpp
@@@ -534,6 -535,17 +536,17 @@@
    src/mc/explo/Exploration.cpp
    src/mc/explo/Exploration.hpp
  
+   src/mc/explo/odpor/Execution.cpp
+   src/mc/explo/odpor/Execution.hpp
+   src/mc/explo/odpor/ReversibleRaceCalculator.cpp
+   src/mc/explo/odpor/ReversibleRaceCalculator.hpp
+   src/mc/explo/odpor/WakeupTree.cpp
+   src/mc/explo/odpor/WakeupTree.hpp
+   src/mc/explo/odpor/WakeupTreeIterator.cpp
+   src/mc/explo/odpor/WakeupTreeIterator.hpp
+   src/mc/explo/odpor/odpor_forward.hpp
+   src/mc/explo/odpor/odpor_tests_private.hpp
+ 
    src/mc/remote/AppSide.cpp
    src/mc/remote/AppSide.hpp
    src/mc/remote/Channel.cpp
@@@ -647,7 -659,6 +660,7 @@@ set(headers_to_instal
    include/simgrid/plugins/live_migration.h
    include/simgrid/plugins/load.h
    include/simgrid/plugins/operation.hpp
 +  include/simgrid/plugins/photovoltaic.hpp
    include/simgrid/plugins/ProducerConsumer.hpp
    include/simgrid/instr.h
    include/simgrid/mailbox.h
@@@ -1125,7 -1136,6 +1138,7 @@@ 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