cosmetics on tracing mechanism

[simgrid.git] / include / instr / instr.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 4f3a2d8..770c1ff 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -1,28 +1,16 @@
-/*
- * instr.h
- *
- *  Created on: Nov 23, 2009
- *      Author: Lucas Schnorr
- *     License: 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.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 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. */
 
 #ifndef INSTR_H_
 #define INSTR_H_
 
-#include "instr/tracing_config.h"
+#include "simgrid_config.h"
 
 #ifdef HAVE_TRACING
 
-#define NO_TRACE               0
-#define TRACE_PLATFORM  1
-#define TRACE_PROCESS   2
-#define TRACE_TASK      4
-#define TRACE_VOLUME    8
-
 #include "xbt.h"
 #include "msg/msg.h"
 
@@ -36,8 +24,7 @@
 #define TRACE_ERROR_FILE_OPEN 401
 #define TRACE_ERROR_START 500
 
-XBT_PUBLIC(int) TRACE_start_with_mask (const char *filename, int mask);
-XBT_PUBLIC(int) TRACE_start (const char *filename);
+XBT_PUBLIC(int) TRACE_start (void);
 XBT_PUBLIC(int) TRACE_end (void);
 XBT_PUBLIC(int) TRACE_category (const char *category);
 XBT_PUBLIC(void) TRACE_define_type (const char *type, const char *parent_type, int final);
@@ -45,55 +32,57 @@ XBT_PUBLIC(int) TRACE_create_category (const char *category, const char *type, c
 XBT_PUBLIC(void) TRACE_msg_set_task_category (m_task_t task, const char *category);
 XBT_PUBLIC(void) TRACE_msg_set_process_category (m_process_t process, const char *category);
 XBT_PUBLIC(void) TRACE_set_mask (int mask);
-XBT_PUBLIC(void) __TRACE_host_variable (double time, const char *variable, double value, const char *what);
-XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what);
+XBT_PUBLIC(void) TRACE_user_host_variable (double time, const char *variable, double value, const char *what);
+XBT_PUBLIC(void) TRACE_user_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what);
+XBT_PUBLIC(void) TRACE_declare_mark (const char *mark_type);
+XBT_PUBLIC(void) TRACE_mark (const char *mark_type, const char *mark_value);
+XBT_PUBLIC(int) TRACE_smpi_set_category (const char *category);
 
 #define TRACE_host_variable_declare(var) \
-       __TRACE_host_variable(0,var,0,"declare");
+       TRACE_user_host_variable(0,var,0,"declare");
 
 #define TRACE_host_variable_set_with_time(time,var,value) \
-       __TRACE_host_variable(time,var,value,"set");
+       TRACE_user_host_variable(time,var,value,"set");
 
 #define TRACE_host_variable_add_with_time(time,var,value) \
-       __TRACE_host_variable(time,var,value,"add");
+       TRACE_user_host_variable(time,var,value,"add");
 
 #define TRACE_host_variable_sub_with_time(time,var,value) \
-       __TRACE_host_variable(time,var,value,"sub");
+       TRACE_user_host_variable(time,var,value,"sub");
 
 #define TRACE_host_variable_set(var,value) \
-       __TRACE_host_variable(MSG_get_clock(),var,value,"set");
+       TRACE_user_host_variable(MSG_get_clock(),var,value,"set");
 
 #define TRACE_host_variable_add(var,value) \
-       __TRACE_host_variable(MSG_get_clock(),var,value,"add");
+       TRACE_user_host_variable(MSG_get_clock(),var,value,"add");
 
 #define TRACE_host_variable_sub(var,value) \
-       __TRACE_host_variable(MSG_get_clock(),var,value,"sub");
+       TRACE_user_host_variable(MSG_get_clock(),var,value,"sub");
 
 #define TRACE_link_variable_declare(var) \
-       __TRACE_link_variable(0,NULL,NULL,var,0,"declare");
+       TRACE_user_link_variable(0,NULL,NULL,var,0,"declare");
 
 #define TRACE_link_variable_set_with_time(time,src,dst,var,value) \
-       __TRACE_link_variable(time,src,dst,var,value,"set");
+       TRACE_user_link_variable(time,src,dst,var,value,"set");
 
 #define TRACE_link_variable_add_with_time(time,src,dst,var,value) \
-       __TRACE_link_variable(time,src,dst,var,value,"add");
+       TRACE_user_link_variable(time,src,dst,var,value,"add");
 
 #define TRACE_link_variable_sub_with_time(time,src,dst,var,value) \
-       __TRACE_link_variable(time,src,dst,var,value,"sub");
+       TRACE_user_link_variable(time,src,dst,var,value,"sub");
 
 #define TRACE_link_variable_set(src,dst,var,value) \
-       __TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"set");
+       TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"set");
 
 #define TRACE_link_variable_add(src,dst,var,value) \
-       __TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"add");
+       TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"add");
 
 #define TRACE_link_variable_sub(src,dst,var,value) \
-       __TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
+       TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
 
 #else /* HAVE_TRACING */
 
-#define TRACE_start(filename)
-#define TRACE_start_with_mask(filename,mask)
+#define TRACE_start()
 #define TRACE_end()
 #define TRACE_category(cat)
 #define TRACE_define_type(cat,supercat,final)
@@ -116,6 +105,9 @@ XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char
 #define TRACE_link_variable_set(src,dst,var,value)
 #define TRACE_link_variable_add(src,dst,var,value)
 #define TRACE_link_variable_sub(src,dst,var,value)
+#define TRACE_declare_mark(type)
+#define TRACE_mark(type,value)
+#define TRACE_smpi_set_category(cat)
 
 #endif /* HAVE_TRACING */