X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63ea61dcf159b166cad6f257cb92912971491470..c714798d5c146946f9ccce06da87bc1707b2de2d:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index d77e87634b..099e21fe25 100644
--- 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,23 @@ 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;
+
/** @brief Task datatype
@ingroup m_datatypes_management_details */
typedef struct m_task {
@@ -50,6 +67,7 @@ typedef struct m_task {
char *category; /* task category for instrumentation */
#endif
} s_m_task_t;
+
/** @brief Task datatype
@ingroup m_datatypes_management
@@ -60,6 +78,31 @@ typedef struct m_task {
@{ */
typedef struct m_task *m_task_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 task may then be defined by a computing
+ amount, a dispatch latency and a collect latency.
+ \see m_task_management
+ @{ */
+typedef struct m_gpu_task *m_gpu_task_t;
+/*************** End GPU ***************/
+
/**
* \brief @brief Communication action
* \ingroup m_datatypes_management
@@ -76,30 +119,19 @@ typedef struct msg_comm *msg_comm_t;
/** @} */
-
-
/* ****************************** Process *********************************** */
-typedef struct simdata_process *simdata_process_t;
-/** @brief Process datatype
- @ingroup m_datatypes_management_details @{ */
-typedef struct m_process {
- s_xbt_swag_hookup_t process_list_hookup;
- 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 code, with some private
+ A process may be defined as a code, with some private
data, executing in a location.
\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
@@ -110,6 +142,7 @@ typedef struct m_process *m_process_t;
@{ */
typedef int m_channel_t;
/** @} */
+#endif
/* ******************************** Mailbox ************************************ */
@@ -137,9 +170,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