From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 20 Oct 2017 09:05:42 +0000 (+0200)
Subject: Merge branch 'actor-priority' of https://github.com/Takishipp/simgrid into Takishipp... 
X-Git-Tag: v3.18~401^2~3^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e2e32849ed01a869c9c70e78014e6938f098be5?hp=-c

Merge branch 'actor-priority' of https://github.com/Takishipp/simgrid into Takishipp-actor-priority
---

9e2e32849ed01a869c9c70e78014e6938f098be5
diff --combined include/simgrid/s4u/Actor.hpp
index c17b7a3b7c,facaf0a59e..f964483be7
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@@ -302,28 -302,36 +302,30 @@@ XBT_ATTRIB_DEPRECATED_v320("Use sleep_f
  
  /** Block the actor, computing the given amount of flops */
  XBT_PUBLIC(void) execute(double flop);
++/** Block the actor, computing the given amount of flops and priority */
++XBT_PUBLIC(void) execute(double flop, double priority);
  
 -  /** Block the actor, computing the given amount of flops and priority */
 -  XBT_PUBLIC(void) execute(double flop, double priority);
 -
 -  /** Block the actor until it gets a message from the given mailbox.
 -   *
 -   * See \ref Comm for the full communication API (including non blocking communications).
 -   */
 -  XBT_PUBLIC(void*)
 -  XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get(): v3.20 will turn this warning into an error.") recv(MailboxPtr chan);
 -  XBT_PUBLIC(void*)
 -  XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get(): v3.20 will turn this warning into an error.")
 -      recv(MailboxPtr chan, double timeout);
 -  XBT_PUBLIC(CommPtr)
 -  XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::recv_async(): v3.20 will turn this warning into an error.")
 -      irecv(MailboxPtr chan, void** data);
 -
 -  /** 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).
 -  */
 -  XBT_PUBLIC(void)
 -  XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put(): v3.20 will turn this warning into an error.")
 -      send(MailboxPtr chan, void* payload, double simulatedSize); // 3.17
 -  XBT_PUBLIC(void)
 -  XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put(): v3.20 will turn this warning into an error.")
 -      send(MailboxPtr chan, void* payload, double simulatedSize, double timeout); // 3.17
 -
 -XBT_PUBLIC(CommPtr)
 -XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put_async(): v3.20 will turn this warning into an error.")
 +/** Block the actor until it gets a message from the given mailbox.
 + *
 + * See \ref Comm for the full communication API (including non blocking communications).
 + */
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get(): v3.20 will turn this warning into an error.") XBT_PUBLIC(void*)
 +    recv(MailboxPtr chan);
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::get(): v3.20 will turn this warning into an error.") XBT_PUBLIC(void*)
 +    recv(MailboxPtr chan, double timeout);
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::recv_async(): v3.20 will turn this warning into an error.") XBT_PUBLIC(CommPtr)
 +    irecv(MailboxPtr chan, void** data);
 +
 +/** 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).
 +*/
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put(): v3.20 will turn this warning into an error.") XBT_PUBLIC(void)
 +    send(MailboxPtr chan, void* payload, double simulatedSize);
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put(): v3.20 will turn this warning into an error.") XBT_PUBLIC(void)
 +    send(MailboxPtr chan, void* payload, double simulatedSize, double timeout);
 +
 +XBT_ATTRIB_DEPRECATED_v320("Use Mailbox::put_async(): v3.20 will turn this warning into an error.") XBT_PUBLIC(CommPtr)
      isend(MailboxPtr chan, void* payload, double simulatedSize);
  
  /** @brief Returns the actor ID of the current actor (same as pid). */