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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 70d1d302db..8816397c02 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -40,18 +40,6 @@ typedef struct m_host {
 typedef struct m_host *m_host_t;
 /** @} */
 
-
-/* ******************************** File ************************************ */
-/** @brief File datatype
-    @ingroup m_datatypes_management_details */
-typedef struct m_file {
-  char *name;                   /**< @brief file name */
-  void *data;                   /**< @brief user data */
-} s_m_file_t;
-
-typedef struct m_file *m_file_t;
-
-
 /* ******************************** Task ************************************ */
 
 typedef struct simdata_task *simdata_task_t;
@@ -78,6 +66,46 @@ typedef struct m_task {
   @{ */
 typedef struct m_task *m_task_t;
 
+/* ******************************** File ************************************ */
+
+typedef struct simdata_file *simdata_file_t;
+
+/** @brief File datatype
+    @ingroup m_datatypes_management_details */
+typedef struct msg_file {
+  char *name;                   /**< @brief file name */
+  simdata_file_t simdata;                /**< @brief simulator data  */
+  void *data;                   /**< @brief user data */
+} s_msg_file_t;
+/** @brief File datatype
+    @ingroup m_datatypes_management_details */
+typedef struct msg_file *msg_file_t;
+
+
+/*************** Begin GPU ***************/
+typedef struct simdata_gpu_task *simdata_gpu_task_t;
+
+/** @brief GPU task datatype
+    @ingroup m_datatypes_management_details */
+typedef struct m_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;
+
+/** @brief GPU task datatype
+    @ingroup m_datatypes_management
+
+    A <em>task</em> may then be defined by a <em>computing
+    amount</em>, a <em>dispatch latency</em> and a <em>collect latency</em>.
+    \see m_task_management
+  @{ */
+typedef struct m_gpu_task *m_gpu_task_t;
+/*************** End GPU ***************/
+
 /**
  * \brief @brief Communication action
  * \ingroup m_datatypes_management
@@ -109,7 +137,7 @@ typedef struct s_smx_process *m_process_t;
 #ifdef MSG_USE_DEPRECATED
 /* ********************************* Channel ******************************** */
 /** @brief Channel datatype  
-    @ingroup m_datatypes_management 
+    @ingroup msg_deprecated_functions
 
     A <em>channel</em>  is a number and identifies a mailbox type (just as a 
     port number does).