X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/782f84d80ed8b775a1973115f6266ae487cae918..b423e899ab6e257d5c2cf489585ad5ca0af21724:/include/msg/datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index e3069262f2..fd06f2f44b 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -7,21 +7,21 @@
 #ifndef MSG_DATATYPE_H
 #define MSG_DATATYPE_H
 #include "xbt/misc.h"
-#include "simgrid_config.h" // for HAVE_TRACING
+#include "simgrid_config.h"     // for HAVE_TRACING
 
 SG_BEGIN_DECL()
 
 /* ******************************** Host ************************************ */
 /** @defgroup m_datatypes_management_details Details on MSG datatypes
     @ingroup  m_datatypes_management*/
-     typedef struct simdata_host *simdata_host_t;
+typedef struct simdata_host *simdata_host_t;
 /** @brief Host datatype 
     @ingroup m_datatypes_management_details */
-     typedef struct m_host {
-       char *name;              /**< @brief host name if any */
-       simdata_host_t simdata;  /**< @brief simulator data */
-       void *data;              /**< @brief user data */
-     } s_m_host_t;
+typedef struct m_host {
+  char *name;                   /**< @brief host name if any */
+  simdata_host_t simdata;       /**< @brief simulator data */
+  void *data;                   /**< @brief user data */
+} s_m_host_t;
 /** @brief Host datatype  
     @ingroup m_datatypes_management
 
@@ -34,22 +34,22 @@ SG_BEGIN_DECL()
 
     \see m_host_management
   @{ */
-     typedef struct m_host *m_host_t;
+typedef struct m_host *m_host_t;
 /** @} */
 /* ******************************** Task ************************************ */
 
-     typedef struct simdata_task *simdata_task_t;
+typedef struct simdata_task *simdata_task_t;
 /** @brief Task datatype 
     @ingroup m_datatypes_management_details */
-     typedef struct m_task {
-       char *name;              /**< @brief task name if any */
-       simdata_task_t simdata;  /**< @brief simulator data */
-       void *data;              /**< @brief user data */
+typedef struct m_task {
+  char *name;                   /**< @brief task name if any */
+  simdata_task_t simdata;       /**< @brief simulator data */
+  void *data;                   /**< @brief user data */
 #ifdef HAVE_TRACING
-       long long int counter;   /* task unique identifier for instrumentation */
-       char *category;      /* task category for instrumentation */
+  long long int counter;        /* task unique identifier for instrumentation */
+  char *category;               /* task category for instrumentation */
 #endif
-     } s_m_task_t;
+} s_m_task_t;
 /** @brief Task datatype  
     @ingroup m_datatypes_management 
 
@@ -58,29 +58,28 @@ SG_BEGIN_DECL()
     data</em>.
     \see m_task_management
   @{ */
-     typedef struct m_task *m_task_t;
+typedef struct m_task *m_task_t;
 
 /** \brief Default value for an uninitialized #m_task_t.
     \ingroup m_datatypes_management 
 */
 #define MSG_TASK_UNINITIALIZED NULL
 
-     typedef struct s_smx_comm *msg_comm_t;
+typedef struct s_smx_action *msg_comm_t;
 /** @} */
 
 
 
 /* ****************************** Process *********************************** */
-     typedef struct simdata_process *simdata_process_t;
+typedef struct simdata_process *simdata_process_t;
 /** @brief Process datatype 
     @ingroup m_datatypes_management_details @{ */
-     typedef struct m_process {
-       char *name;              /**< @brief process name if any */
-       simdata_process_t simdata;
+typedef struct m_process {
+  char *name;                   /**< @brief process name if any */
+  simdata_process_t simdata;
                                 /**< @brief simulator data */
-       void *data;              /**< @brief user data */
-       char *category;      /* process category for instrumentation */
-     } s_m_process_t;
+  void *data;                   /**< @brief user data */
+} s_m_process_t;
 /** @} */
 /** @brief Agent datatype  
     @ingroup m_datatypes_management 
@@ -89,7 +88,7 @@ SG_BEGIN_DECL()
     data</em>, executing in a <em>location</em>.
     \see m_process_management
   @{ */
-     typedef struct m_process *m_process_t;
+typedef struct m_process *m_process_t;
 /** @} */
 
 /* ********************************* Channel ******************************** */
@@ -100,17 +99,16 @@ SG_BEGIN_DECL()
     port number does).
     \see m_channel_management
    @{ */
-     typedef int m_channel_t;
+typedef int m_channel_t;
 /** @} */
 
 /* ******************************** Mailbox ************************************ */
 
-     typedef struct s_msg_mailbox *msg_mailbox_t;
+typedef struct s_smx_rvpoint *msg_mailbox_t;
 /** @brief Mailbox datatype
     @ingroup m_datatypes_management_details @{ */
 
-     msg_mailbox_t MSG_mailbox_create(const char *alias);
-     void MSG_mailbox_free(void *mailbox);
+void MSG_mailbox_free(void *mailbox);
 
 
 /** @} */
@@ -119,19 +117,19 @@ SG_BEGIN_DECL()
 /* ***************************** Error handling ***************************** */
 /** @brief Error handling 
     @ingroup m_datatypes_management 
-    @{
-*/ /* Keep these code as binary values: java bindings manipulate | of these values */
-     typedef enum {
-       MSG_OK = 0,            /**< @brief Everything is right. Keep on going this way ! */
-       MSG_TIMEOUT=1,         /**< @brief nothing good happened before the timer you provided elapsed */
-       MSG_TRANSFER_FAILURE=2,/**< @brief There has been a problem during you task
+         @{
+*//* Keep these code as binary values: java bindings manipulate | of these values */
+typedef enum {
+  MSG_OK = 0,                 /**< @brief Everything is right. Keep on going this way ! */
+  MSG_TIMEOUT = 1,            /**< @brief nothing good happened before the timer you provided elapsed */
+  MSG_TRANSFER_FAILURE = 2,   /**< @brief There has been a problem during you task
       transfer. Either the network is down or the remote host has been
       shutdown. */
-       MSG_HOST_FAILURE=4,    /**< @brief System shutdown. The host on which you are
+  MSG_HOST_FAILURE = 4,       /**< @brief System shutdown. The host on which you are
       running has just been rebooted. Free your datastructures and
       return now !*/
-       MSG_TASK_CANCELLED=8,  /**< @brief Canceled task. This task has been canceled by somebody!*/
-     } MSG_error_t;
+  MSG_TASK_CANCELLED = 8,     /**< @brief Canceled task. This task has been canceled by somebody!*/
+} MSG_error_t;
 /** @} */
 
 SG_END_DECL()