Add missing include for HAVE_TRACING [Arnaud Giersch]

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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 3187380..e306926 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +7,7 @@
 #ifndef MSG_DATATYPE_H
 #define MSG_DATATYPE_H
 #include "xbt/misc.h"
+#include "simgrid_config.h" // for HAVE_TRACING
 
 SG_BEGIN_DECL()
 
@@ -45,6 +45,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 
@@ -61,6 +65,7 @@ SG_BEGIN_DECL()
 */
 #define MSG_TASK_UNINITIALIZED NULL
 
+     typedef struct s_smx_comm *msg_comm_t;
 /** @} */
 
 
@@ -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  
@@ -114,27 +120,17 @@ SG_BEGIN_DECL()
 /** @brief Error handling 
     @ingroup m_datatypes_management 
     @{
-*/
+*/ /* 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_WARNING,
-               /**< @brief Mmmh! Something must be not perfectly clean. But I
-      may be a paranoid freak... ! */
-       MSG_TIMEOUT_FAILURE, /**< @brief nothing good happened before the timer you provided elapsed */
-       MSG_TRANSFER_FAILURE,
-                        /**< @brief There has been a problem during you task
+       MSG_OK = 0,            /**< @brief Everything is right. Keep on going this way ! */
+       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. */
-       MSG_HOST_FAILURE,
-                    /**< @brief System shutdown. The host on which you are
+       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,
-                      /**< @brief Cancelled task. This task has been cancelled 
-                       by somebody!*/
-       MSG_FATAL
-            /**< @brief You've done something wrong. You'd better look at it... */
+       MSG_TASK_CANCELLED=8,  /**< @brief Canceled task. This task has been canceled by somebody!*/
      } MSG_error_t;
 /** @} */