From 0bf95fe1cd58b85aa7bbcf61a76fb07e481d51c4 Mon Sep 17 00:00:00 2001 From: schnorr Date: Wed, 14 Apr 2010 09:58:46 +0000 Subject: [PATCH] implement TRACE_start as function instead of pre-processor define git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7564 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/instr/instr.h | 3 +-- src/instr/interface.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/instr/instr.h b/include/instr/instr.h index d1a8f5a902..53a811fdb2 100644 --- a/include/instr/instr.h +++ b/include/instr/instr.h @@ -36,6 +36,7 @@ #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_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); @@ -46,8 +47,6 @@ 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); -#define TRACE_start(filename) TRACE_start_with_mask(filename,TRACE_PLATFORM) - #define TRACE_host_variable_declare(var) \ __TRACE_host_variable(0,var,0,"declare"); diff --git a/src/instr/interface.c b/src/instr/interface.c index 38189a7cce..55024ba33e 100644 --- a/src/instr/interface.c +++ b/src/instr/interface.c @@ -15,7 +15,7 @@ #ifdef HAVE_TRACING -XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Surf"); +XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Interface"); extern xbt_dict_t created_containers; /* declared in general.c */ static xbt_dict_t defined_types; @@ -23,7 +23,18 @@ static xbt_dict_t created_categories; int trace_mask; -/** +/** \ingroup tracing + * \brief Simple initialization of tracing. + * + * \param filename of the file that will contain the traces + * \return 0 if everything is ok + */ +int TRACE_start (const char *filename) +{ + return TRACE_start_with_mask (filename, TRACE_PLATFORM); +} + +/** \ingroup tracing * \brief Initialization of tracing. * * Function to be called at first when tracing a simulation -- 2.20.1