[trace] renaming system call to set any action tracing categories, make useful also...

[simgrid.git] / src / simix / smurf_private.h

diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 7a80c3f..09050f9 100644 (file)
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -24,9 +24,6 @@ typedef enum {
   REQ_HOST_EXECUTION_GET_REMAINS,
   REQ_HOST_EXECUTION_GET_STATE,
   REQ_HOST_EXECUTION_SET_PRIORITY,
   REQ_HOST_EXECUTION_GET_REMAINS,
   REQ_HOST_EXECUTION_GET_STATE,
   REQ_HOST_EXECUTION_SET_PRIORITY,

-#ifdef HAVE_TRACING
-  REQ_HOST_EXECUTION_SET_CATEGORY,
-#endif

   REQ_HOST_EXECUTION_WAIT,
   REQ_PROCESS_CREATE,
   REQ_PROCESS_KILL,
   REQ_HOST_EXECUTION_WAIT,
   REQ_PROCESS_CREATE,
   REQ_PROCESS_KILL,


@@ -64,6 +61,9 @@ typedef enum {
   REQ_COMM_GET_DST_PROC,
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   REQ_COMM_IS_LATENCY_BOUNDED,
   REQ_COMM_GET_DST_PROC,
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   REQ_COMM_IS_LATENCY_BOUNDED,

+#endif
+#ifdef HAVE_TRACING
+  REQ_SET_CATEGORY,

 #endif
   REQ_MUTEX_INIT,
   REQ_MUTEX_DESTROY,
 #endif
   REQ_MUTEX_INIT,
   REQ_MUTEX_DESTROY,


@@ -173,13 +173,6 @@ typedef struct s_smx_req {
       double priority;
     } host_execution_set_priority;
 
       double priority;
     } host_execution_set_priority;
 

-#ifdef HAVE_TRACING
-    struct {
-      smx_action_t execution;
-      const char *category;
-    } host_execution_set_category;
-#endif
-

     struct {
       smx_action_t execution;
     } host_execution_wait;
     struct {
       smx_action_t execution;
     } host_execution_wait;


@@ -369,6 +362,13 @@ typedef struct s_smx_req {
     } comm_is_latency_bounded;
 #endif
 
     } comm_is_latency_bounded;
 #endif
 

+#ifdef HAVE_TRACING
+    struct {
+      smx_action_t action;
+      const char *category;
+    } set_category;
+#endif
+

     struct {
       smx_mutex_t result;
     } mutex_init;
     struct {
       smx_mutex_t result;
     } mutex_init;