From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 30 Oct 2023 02:59:21 +0000 (+0000)
Subject: Merge branch 'mq' into 'master'
X-Git-Tag: v3.35~89^2~28
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3973bb7a4ee47daf6a4a682f18d18b409c5d6de8?hp=-c

Merge branch 'mq' into 'master'

Message queues

See merge request simgrid/simgrid!176
---

3973bb7a4ee47daf6a4a682f18d18b409c5d6de8
diff --combined MANIFEST.in
index 2c3927c307,f2f6e1d086..7e7547efe5
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@@ -166,10 -166,6 +166,10 @@@ include examples/cpp/app-masterworkers/
  include examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml
  include examples/cpp/app-token-ring/s4u-app-token-ring.cpp
  include examples/cpp/app-token-ring/s4u-app-token-ring.tesh
 +include examples/cpp/battery-chiller-solar/s4u-battery-chiller-solar.cpp
 +include examples/cpp/battery-chiller-solar/s4u-battery-chiller-solar.tesh
 +include examples/cpp/battery-connector/s4u-battery-connector.cpp
 +include examples/cpp/battery-connector/s4u-battery-connector.tesh
  include examples/cpp/battery-degradation/plot_battery_degradation.py
  include examples/cpp/battery-degradation/s4u-battery-degradation.cpp
  include examples/cpp/battery-degradation/s4u-battery-degradation.tesh
@@@ -334,6 -330,8 +334,8 @@@ include examples/cpp/mc-failing-assert/
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert-statequality.tesh
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.tesh
+ include examples/cpp/mess-wait/s4u-mess-wait.cpp
+ include examples/cpp/mess-wait/s4u-mess-wait.tesh
  include examples/cpp/network-factors/s4u-network-factors.cpp
  include examples/cpp/network-factors/s4u-network-factors.tesh
  include examples/cpp/network-nonlinear/s4u-network-nonlinear.cpp
@@@ -1973,6 -1971,7 +1975,7 @@@ include include/simgrid/s4u/Host.hp
  include include/simgrid/s4u/Io.hpp
  include include/simgrid/s4u/Link.hpp
  include include/simgrid/s4u/Mailbox.hpp
+ include include/simgrid/s4u/MessageQueue.hpp
  include include/simgrid/s4u/Mutex.hpp
  include include/simgrid/s4u/NetZone.hpp
  include include/simgrid/s4u/Semaphore.hpp
@@@ -2069,6 -2068,10 +2072,10 @@@ include src/kernel/activity/IoImpl.cp
  include src/kernel/activity/IoImpl.hpp
  include src/kernel/activity/MailboxImpl.cpp
  include src/kernel/activity/MailboxImpl.hpp
+ include src/kernel/activity/MessImpl.cpp
+ include src/kernel/activity/MessImpl.hpp
+ include src/kernel/activity/MessageQueueImpl.cpp
+ include src/kernel/activity/MessageQueueImpl.hpp
  include src/kernel/activity/MutexImpl.cpp
  include src/kernel/activity/MutexImpl.hpp
  include src/kernel/activity/SemaphoreImpl.cpp
@@@ -2353,6 -2356,8 +2360,8 @@@ include src/s4u/s4u_Host.cp
  include src/s4u/s4u_Io.cpp
  include src/s4u/s4u_Link.cpp
  include src/s4u/s4u_Mailbox.cpp
+ include src/s4u/s4u_Mess.cpp
+ include src/s4u/s4u_MessageQueue.cpp
  include src/s4u/s4u_Mutex.cpp
  include src/s4u/s4u_Netzone.cpp
  include src/s4u/s4u_Semaphore.cpp
diff --combined examples/cpp/CMakeLists.txt
index 6f1af7f34e,7de7809a0e..0bb15a0a9f
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -157,7 -157,7 +157,7 @@@ foreach (example activityset-testany ac
                   actor-create actor-daemon actor-exiting actor-join actor-kill
                   actor-lifetime actor-migrate actor-suspend actor-yield actor-stacksize
                   app-bittorrent app-chainsend app-token-ring
 -                 battery-degradation battery-simple battery-energy
 +                 battery-chiller-solar battery-connector 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
@@@ -170,6 -170,7 +170,7 @@@
                   exec-ptask-multicore exec-ptask-multicore-latency exec-cpu-nonlinear exec-cpu-factors exec-failure exec-threads
                   maestro-set
                   mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
+                  mess-wait
                   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-dispatch task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load