From 14b8a433dc3ded0e9fddce253640b5b852daf793 Mon Sep 17 00:00:00 2001
From: Fred Suter <suterf@ornl.gov>
Date: Thu, 26 Oct 2023 16:29:23 -0400
Subject: [PATCH] rework MessImpl

---
 src/kernel/activity/MessImpl.cpp | 27 ++++++++++++++++++++-------
 src/kernel/activity/MessImpl.hpp |  2 ++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/kernel/activity/MessImpl.cpp b/src/kernel/activity/MessImpl.cpp
index 9f77c7da8e..28679c2a4b 100644
--- a/src/kernel/activity/MessImpl.cpp
+++ b/src/kernel/activity/MessImpl.cpp
@@ -47,8 +47,12 @@ MessImpl& MessImpl::set_dst_buff(unsigned char* buff, size_t* size)
 
 MessImpl* MessImpl::start()
 {
-  if (get_state() == State::READY)
-    set_state(State::DONE);
+  if (get_state() == State::READY) {
+    XBT_DEBUG("Starting message exchange %p from '%s' to '%s' (state: %s)", this, src_actor_->get_host()->get_cname(),
+              dst_actor_->get_host()->get_cname(), get_state_str());
+    set_state(State::RUNNING);
+    finish();
+  }
   return this;
 }
 
@@ -87,20 +91,20 @@ ActivityImplPtr MessImpl::iput(actor::MessIputSimcall* observer)
 
 ActivityImplPtr MessImpl::iget(actor::MessIgetSimcall* observer)
 {
-  MessImplPtr this_synchro(new MessImpl());
-  this_synchro->set_type(MessImplType::GET);
+  MessImplPtr this_mess(new MessImpl());
+  this_mess->set_type(MessImplType::GET);
 
   auto* queue = observer->get_queue();
-  XBT_DEBUG("get from message queue %p. this_synchro=%p", queue, this_synchro.get());
+  XBT_DEBUG("get from message queue %p. this_synchro=%p", queue, this_mess.get());
 
   MessImplPtr other_mess = queue->find_matching_message(MessImplType::PUT);
 
   if (other_mess == nullptr) {
     XBT_DEBUG("Get pushed first (%zu comm enqueued so far)", queue->size());
-    other_mess = std::move(this_synchro);
+    other_mess = std::move(this_mess);
     queue->push(other_mess);
   } else {
-    XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_mess.get());
+    XBT_DEBUG("Match my %p with the existing %p", this_mess.get(), other_mess.get());
 
     other_mess->set_state(State::READY);
   }
@@ -117,6 +121,15 @@ ActivityImplPtr MessImpl::iget(actor::MessIgetSimcall* observer)
   return other_mess;
 }
 
+void MessImpl::wait_for(actor::ActorImpl* issuer, double timeout)
+{
+  XBT_DEBUG("MessImpl::wait_for(%g), %p, state %s", timeout, this, get_state_str());
+
+  /* Associate this simcall to the wait synchro */
+  register_simcall(&issuer->simcall_);
+  ActivityImpl::wait_for(issuer, timeout);
+}
+
 void MessImpl::finish()
 {
   XBT_DEBUG("MessImpl::finish() comm %p, state %s, src_proc %p, dst_proc %p", this, get_state_str(),
diff --git a/src/kernel/activity/MessImpl.hpp b/src/kernel/activity/MessImpl.hpp
index 1232c61cef..fad011c7b1 100644
--- a/src/kernel/activity/MessImpl.hpp
+++ b/src/kernel/activity/MessImpl.hpp
@@ -36,6 +36,8 @@ public:
   static ActivityImplPtr iput(actor::MessIputSimcall* observer);
   static ActivityImplPtr iget(actor::MessIgetSimcall* observer);
 
+  void wait_for(actor::ActorImpl* issuer, double timeout) override;
+
   MessImpl* start();
   void set_exception(actor::ActorImpl* issuer) override {};
   void finish() override;
-- 
2.20.1