From 03d43697b86d02c58d6d96455392f59363e1f0c8 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 17 Aug 2015 18:42:40 +0200 Subject: [PATCH] let's keep the API simple, with reduced redudency (kill actor::send_init) --- include/simgrid/s4u/actor.hpp | 13 ++++++++----- src/s4u/s4u_actor.cpp | 4 ---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/simgrid/s4u/actor.hpp b/include/simgrid/s4u/actor.hpp index bcfff139e3..b342262e44 100644 --- a/include/simgrid/s4u/actor.hpp +++ b/include/simgrid/s4u/actor.hpp @@ -84,15 +84,18 @@ public: /** Block the actor, computing the given amount of flops */ e_smx_state_t execute(double flop); - /** Block the actor until it gets a message from the given mailbox */ + /** Block the actor until it gets a message from the given mailbox. + * + * See \ref Comm for the full communication API (including non blocking communications). + */ void *recv(Mailbox &chan); - /** Block the actor until it delivers a message of the given simulated size to the given mailbox */ + /** Block the actor until it delivers a message of the given simulated size to the given mailbox + * + * See \ref Comm for the full communication API (including non blocking communications). + */ void send(Mailbox &chan, void*payload, size_t simulatedSize); - /** Creates (but don't start) an async send action */ - Comm &send_init(Mailbox &chan); - protected: smx_process_t getInferior() {return p_smx_process;} private: diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 7d3be59c3d..252c441dc4 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -105,7 +105,3 @@ void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) { // c.start() is optional. c.wait(); } - -s4u::Comm &s4u::Actor::send_init(Mailbox &chan) { - return s4u::Comm::send_init(this, chan); -} -- 2.20.1