Merge branch 'v3_9_x'

diff --git a/doc/doxygen/index-API.doc b/doc/doxygen/index-API.doc
deleted file mode 100644 (file)
index aa50773..0000000
--- a/doc/doxygen/index-API.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-This file was generated by tools/doxygen/index_create.pl. DO NOT EDIT.
-
-/** \defgroup API_index Full Index
-  * \brief The alphabetical list of all functions, macros and types 
-  *  defined by SimGrid
-  *
-  * List of all functions, variables, defines, enums, and typedefs with
-  * links to the files they belong to. 
-  *
-  * \htmlonly Altough completely useless, the complete list of structures defined can be found <a href="annotated.html">here</a> \endhtmlonly
-
-
-*/
\ No newline at end of file

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 41b9483..3be2d06 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -224,6 +224,7 @@ XBT_PUBLIC(msg_error_t)
 #define MSG_task_recv(t,a) MSG_task_receive(t,a)
 
 XBT_PUBLIC(msg_comm_t) MSG_task_isend(msg_task_t task, const char *alias);
+XBT_PUBLIC(msg_comm_t) MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate);
 XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task,
                                                     const char *alias,
                                                     int (*match_fun)(void*,void*, smx_action_t),

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index bcc59e1..e26738e 100644 (file)
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -271,6 +271,25 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias)
   return MSG_task_isend_with_matching(task,alias,NULL,NULL);
 }
 
+/** \ingroup msg_task_usage
+ * \brief Sends a task on a mailbox with a maximum rate
+ *
+ * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test()
+ * to end the communication. The maxrate parameter allows the application
+ * to limit the bandwidth utilization of network links when sending the task.
+ *
+ * \param task a #msg_task_t to send on another location.
+ * \param alias name of the mailbox to sent the task to
+ * \param maxrate the maximum communication rate for sending this task .
+ * \return the msg_comm_t communication created
+ */
+msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate)
+{
+  task->simdata->rate = maxrate;
+  return MSG_task_isend_with_matching(task,alias,NULL,NULL);
+}
+
+
 /** \ingroup msg_task_usage
  * \brief Sends a task on a mailbox, with support for matching requests
  *