X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84ed556b8c7cf58207b813f2104075767c837d36..572221a7949ce2c69f9fb408d697e7fe0ba93ba4:/include/msg/datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index e80eb71c95..255b1558d5 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -8,6 +8,7 @@
 #ifndef MSG_DATATYPE_H
 #define MSG_DATATYPE_H
 #include "xbt/misc.h"
+#include "instr/tracing_config.h" // for HAVE_TRACING
 
 SG_BEGIN_DECL()
 
@@ -45,6 +46,10 @@ SG_BEGIN_DECL()
        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 */
+#endif
      } s_m_task_t;
 /** @brief Task datatype  
     @ingroup m_datatypes_management 
@@ -74,6 +79,7 @@ SG_BEGIN_DECL()
        simdata_process_t simdata;
                                 /**< @brief simulator data */
        void *data;              /**< @brief user data */
+       char *category;      /* process category for instrumentation */
      } s_m_process_t;
 /** @} */
 /** @brief Agent datatype  
@@ -117,7 +123,7 @@ SG_BEGIN_DECL()
 */ /* 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_FAILURE=1, /**< @brief nothing good happened before the timer you provided elapsed */
+       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. */