X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df12bbc75c274351f3b3a628740e0b3270f08e18..30e53e313b361eadd271dd83184627f43d480491:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index f7a6c78a01..483c582c1c 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -53,7 +53,7 @@ typedef struct msg_host *msg_host_t;
typedef struct simdata_task *simdata_task_t;
-typedef struct m_task {
+typedef struct msg_task {
char *name; /**< @brief task name if any */
simdata_task_t simdata; /**< @brief simulator data */
void *data; /**< @brief user data */
@@ -61,7 +61,7 @@ typedef struct m_task {
long long int counter; /* task unique identifier for instrumentation */
char *category; /* task category for instrumentation */
#endif
-} s_m_task_t;
+} s_msg_task_t;
/** @brief Task datatype.
@ingroup m_task_management
@@ -70,7 +70,7 @@ typedef struct m_task {
amount, a message size and some private
data.
*/
-typedef struct m_task *m_task_t;
+typedef struct msg_task *msg_task_t;
/* ******************************** File ************************************ */
@@ -95,14 +95,14 @@ typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task *simdata_gpu_task_t;
-typedef struct m_gpu_task {
+typedef struct msg_gpu_task {
char *name; /**< @brief task name if any */
simdata_gpu_task_t simdata; /**< @brief simulator data */
#ifdef HAVE_TRACING
long long int counter; /* task unique identifier for instrumentation */
char *category; /* task category for instrumentation */
#endif
-} s_m_gpu_task_t;
+} s_msg_gpu_task_t;
/** @brief GPU task datatype.
@ingroup m_task_management
@@ -111,7 +111,7 @@ typedef struct m_gpu_task {
amount, a dispatch latency and a collect latency.
\see m_task_management
*/
-typedef struct m_gpu_task *m_gpu_task_t;
+typedef struct msg_gpu_task *msg_gpu_task_t;
/*************** End GPU ***************/
/**
@@ -122,7 +122,7 @@ typedef struct m_gpu_task *m_gpu_task_t;
*/
typedef struct msg_comm *msg_comm_t;
-/** \brief Default value for an uninitialized #m_task_t.
+/** \brief Default value for an uninitialized #msg_task_t.
\ingroup m_task_management
*/
#define MSG_TASK_UNINITIALIZED NULL
@@ -141,12 +141,17 @@ typedef struct msg_comm *msg_comm_t;
*/
typedef struct s_smx_process *msg_process_t;
-/* Compatibility typedefs */
-typedef msg_process_t m_process_t;
-typedef msg_host_t m_host_t;
-
#ifdef MSG_USE_DEPRECATED
-typedef int m_channel_t;
+
+/* Compatibility typedefs */
+typedef int m_channel_t;
+typedef msg_gpu_task_t m_gpu_task_t;
+typedef msg_host_t m_host_t;
+typedef msg_process_t m_process_t;
+typedef msg_task_t m_task_t;
+typedef s_msg_gpu_task_t s_m_gpu_task_t;
+typedef s_msg_host_t s_m_host_t;
+typedef s_msg_task_t s_m_task_t;
#endif
SG_END_DECL()