Add function MSG_comm_waitall for icomm and add one more example.

[simgrid.git] / include / msg / msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index e8d581f..18c749f 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -113,8 +112,6 @@ XBT_PUBLIC(m_host_t) MSG_task_get_source(m_task_t task);
 XBT_PUBLIC(const char *) MSG_task_get_name(m_task_t task);
 XBT_PUBLIC(MSG_error_t) MSG_task_cancel(m_task_t task);
 XBT_PUBLIC(MSG_error_t) MSG_task_destroy(m_task_t task);
-XBT_PUBLIC(void) MSG_task_ref(m_task_t t);
-XBT_PUBLIC(int) MSG_task_has_data(m_task_t t);
 
 XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel);
 XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task,
@@ -168,6 +165,14 @@ XBT_PUBLIC(MSG_error_t)
 XBT_PUBLIC(MSG_error_t)
   MSG_task_receive(m_task_t * task, const char *alias);
 
+XBT_PUBLIC(msg_comm_t)   MSG_task_isend(m_task_t task, const char *alias);
+XBT_PUBLIC(msg_comm_t)   MSG_task_irecv(m_task_t * task, const char *alias);
+XBT_PUBLIC(int)               MSG_comm_test(msg_comm_t comm);
+XBT_PUBLIC(void)              MSG_comm_destroy(msg_comm_t comm);
+XBT_PUBLIC(MSG_error_t) MSG_comm_wait(msg_comm_t comm,double timeout);
+XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t *comm,int nb_elem, double timeout);
+
+
 XBT_PUBLIC(int) MSG_task_listen(const char *alias);
 
 XBT_PUBLIC(int) MSG_task_listen_from_host(const char *alias, m_host_t host);
@@ -204,10 +209,14 @@ XBT_PUBLIC(void) MSG_action_unregister(const char *action_name);
 
 
 #ifdef MSG_USE_DEPRECATED
+/* these are the functions which are deprecated. Do not use them, they may get removed in future releases */
+#define MSG_TIMEOUT_FAILURE MSG_TIMEOUT
 #define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \
         MSG_mailbox_put_with_timeout(mailbox, task, timeout)
 
 #endif
 
+#include "instr/instr.h"
+
 SG_END_DECL()
 #endif