Merge all public simix headers, and distribute them in simgrid directory

[simgrid.git] / src / msg / msg_mailbox.h

diff --git a/src/msg/msg_mailbox.h b/src/msg/msg_mailbox.h
index aa1ab44..851e77c 100644 (file)
--- a/src/msg/msg_mailbox.h
+++ b/src/msg/msg_mailbox.h
@@ -4,11 +4,11 @@
 /* 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. */
 
-#ifndef SMX_MAILBOX_H
-#define SMX_MAILBOX_H
+#ifndef MSG_MAILBOX_H
+#define MSG_MAILBOX_H
 
 #include "xbt/fifo.h"
-#include "simix/simix.h"
+#include "simgrid/simix.h"
 #include "msg/datatypes.h"
 
 
@@ -27,6 +27,8 @@ SG_BEGIN_DECL()
 XBT_PUBLIC(msg_mailbox_t)
     MSG_mailbox_new(const char *alias);
 
+void MSG_mailbox_free(void *mailbox);
+
 /* \brief MSG_mailbox_free - release a mailbox from the memory.
  *
  * The function MSG_mailbox_free release a mailbox from the memory but does
@@ -52,22 +54,6 @@ void MSG_mailbox_free(void *mailbox);
 XBT_PUBLIC(msg_mailbox_t)
     MSG_mailbox_get_by_alias(const char *alias);
 
-/* \brief MSG_mailbox_get_by_channel - get a mailbox of the specified host from its channel.
- *
- * The function MSG_mailbox_get_by_channel returns the mailbox of the
- * specified host from the channel specified by the parameter
- * channel. If the mailbox does not exists, the function fails.
- *
- * \param host         The host containing he mailbox to get.
- * \param channel      The channel used to identify the mailbox.
- *
- * \return The mailbox of the specified host associated the channel
- *         specified as parameter.
- *
- */
-XBT_PUBLIC(msg_mailbox_t)
-    MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel);
-
 /*! \brief MSG_mailbox_is_empty - test if a mailbox is empty.
  *
  * The function MSG_mailbox_is_empty tests if a mailbox is empty
@@ -108,6 +94,23 @@ XBT_PUBLIC(int)
 MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
                                          m_host_t host);
 
+#ifdef MSG_USE_DEPRECATED
+/* \brief MSG_mailbox_get_by_channel - get a mailbox of the specified host from its channel.
+ *
+ * The function MSG_mailbox_get_by_channel returns the mailbox of the
+ * specified host from the channel specified by the parameter
+ * channel. If the mailbox does not exists, the function fails.
+ *
+ * \param host      The host containing he mailbox to get.
+ * \param channel   The channel used to identify the mailbox.
+ *
+ * \return The mailbox of the specified host associated the channel
+ *         specified as parameter.
+ *
+ */
+XBT_PUBLIC(msg_mailbox_t)
+    MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel);
+#endif
 
 SG_END_DECL()
-#endif                          /* !SMX_MAILBOX_H */
+#endif                          /* !MSG_MAILBOX_H */