X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..d62761dc9056a949309e78420f0d077aeb79efaa:/include/msg/msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index d6df06671d..18c749fc5f 100644
--- 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. */
@@ -27,7 +26,6 @@ XBT_PUBLIC(void) MSG_function_register(const char *name,
 XBT_PUBLIC(void) MSG_function_register_default(xbt_main_func_t code);
 XBT_PUBLIC(xbt_main_func_t) MSG_get_registered_function(const char *name);
 XBT_PUBLIC(void) MSG_launch_application(const char *file);
-XBT_PUBLIC(void) MSG_paje_output(const char *filename);
 
 XBT_PUBLIC(double) MSG_get_clock(void);
 XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void);
@@ -108,6 +106,7 @@ XBT_PUBLIC(m_task_t) MSG_parallel_task_create(const char *name, int host_nb,
                                               double *communication_amount,
                                               void *data);
 XBT_PUBLIC(void *) MSG_task_get_data(m_task_t task);
+XBT_PUBLIC(void) MSG_task_set_data(m_task_t task,void*data);
 XBT_PUBLIC(m_process_t) MSG_task_get_sender(m_task_t task);
 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);
@@ -166,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);
@@ -201,5 +208,15 @@ XBT_PUBLIC(void) MSG_action_unregister(const char *action_name);
      MSG_error_t MSG_action_trace_run(char *path);
 
 
+#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