Make smx_file_t, surf_file_t and msg_file_t

[simgrid.git] / include / msg / datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index fd06f2f..8816397 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -12,9 +12,11 @@
 SG_BEGIN_DECL()
 
 /* ******************************** Host ************************************ */
+
 /** @defgroup m_datatypes_management_details Details on MSG datatypes
     @ingroup  m_datatypes_management*/
 typedef struct simdata_host *simdata_host_t;
+
 /** @brief Host datatype 
     @ingroup m_datatypes_management_details */
 typedef struct m_host {
@@ -22,6 +24,7 @@ typedef struct m_host {
   simdata_host_t simdata;       /**< @brief simulator data */
   void *data;                   /**< @brief user data */
 } s_m_host_t;
+
 /** @brief Host datatype  
     @ingroup m_datatypes_management
 
@@ -36,9 +39,11 @@ typedef struct m_host {
   @{ */
 typedef struct m_host *m_host_t;
 /** @} */
+
 /* ******************************** Task ************************************ */
 
 typedef struct simdata_task *simdata_task_t;
+
 /** @brief Task datatype 
     @ingroup m_datatypes_management_details */
 typedef struct m_task {
@@ -50,6 +55,7 @@ typedef struct m_task {
   char *category;               /* task category for instrumentation */
 #endif
 } s_m_task_t;
+
 /** @brief Task datatype  
     @ingroup m_datatypes_management 
 
@@ -60,40 +66,78 @@ 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
+ *
+ * Communication actions transfer tasks between processes.
+ * For a given task, the sender and the receiver have distinct objects.
+ */
+typedef struct msg_comm *msg_comm_t;
+
 /** \brief Default value for an uninitialized #m_task_t.
     \ingroup m_datatypes_management 
 */
 #define MSG_TASK_UNINITIALIZED NULL
 
-typedef struct s_smx_action *msg_comm_t;
 /** @} */
 
-
-
 /* ****************************** Process *********************************** */
-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;
-                                /**< @brief simulator data */
-  void *data;                   /**< @brief user data */
-} s_m_process_t;
-/** @} */
-/** @brief Agent datatype  
+
+/** @brief Process datatype
     @ingroup m_datatypes_management 
 
-    An agent may be defined as a <em>code</em>, with some <em>private
+    A process may be defined as a <em>code</em>, with some <em>private
     data</em>, executing in a <em>location</em>.
     \see m_process_management
   @{ */
-typedef struct m_process *m_process_t;
+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).
@@ -101,6 +145,7 @@ typedef struct m_process *m_process_t;
    @{ */
 typedef int m_channel_t;
 /** @} */
+#endif
 
 /* ******************************** Mailbox ************************************ */
 
@@ -128,9 +173,10 @@ typedef enum {
   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_TASK_CANCELED = 8      /**< @brief Canceled task. This task has been canceled by somebody!*/
 } MSG_error_t;
 /** @} */
 
+
 SG_END_DECL()
 #endif