-/*
- * 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"
-
#ifdef HAVE_TRACING
-#define NO_TRACE 0
-#define TRACE_PLATFORM 1
-#define TRACE_PROCESS 2
-#define TRACE_TASK 4
-
#include "xbt.h"
#include "msg/msg.h"
#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);
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_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");
#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)
#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 */