python: First working example

[simgrid.git] / src / s4u / s4u_Mailbox.cpp

diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index b2b60de..bcf0309 100644 (file)
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -48,8 +48,8 @@ bool Mailbox::ready()
   bool comm_ready = false;
   if (not pimpl_->comm_queue_.empty()) {
     comm_ready = pimpl_->comm_queue_.front()->state_ == SIMIX_DONE;
-  }
-  if (!comm_ready && pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
+    
+  } else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
     comm_ready = pimpl_->done_comm_queue_.front()->state_ == SIMIX_DONE;
   }
   return comm_ready;
@@ -114,7 +114,7 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
   c->set_remaining(simulated_size_in_bytes);
   c->set_src_data(payload);
   // c->start() is optional.
-  c->wait(timeout);
+  c->wait_for(timeout);
 }
 
 s4u::CommPtr Mailbox::get_init()
@@ -145,7 +145,7 @@ void* Mailbox::get(double timeout)
   void* res = nullptr;
   CommPtr c = get_init();
   c->set_dst_data(&res, sizeof(res));
-  c->wait(timeout);
+  c->wait_for(timeout);
   return res;
 }
 } // namespace s4u