X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..c271686fd059bd4313549ec557eb44f82109a03d:/src/include/surf/trace_mgr.h

diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h
index 0ea8271f3b..2598b77677 100644
--- a/src/include/surf/trace_mgr.h
+++ b/src/include/surf/trace_mgr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2007, 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,22 +13,24 @@
 #include "surf/datatypes.h"
 #include "simgrid/platf_interface.h"
 
+SG_BEGIN_DECL()
+
 /* Creation functions */
-XBT_PUBLIC(tmgr_history_t) tmgr_history_new(void);
-XBT_PUBLIC(void) tmgr_history_free(tmgr_history_t history);
+XBT_PUBLIC(tmgr_fes_t) tmgr_history_new(void);
+XBT_PUBLIC(void) tmgr_history_free(tmgr_fes_t history);
 
 XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void);
-XBT_INLINE XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
+XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
 /**
  * \brief Free a trace event structure
  *
  * This function frees a trace_event if it can be freed, ie, if it has the free_me flag set to 1. This flag indicates whether the structure is still used somewhere or not.
- * \param	trace_event		Trace event structure
+ * \param  trace_event    Trace event structure
  * \return 1 if the structure was freed, 0 otherwise
 */
-XBT_PUBLIC(int) tmgr_trace_event_free(tmgr_trace_event_t trace_event);
+XBT_PUBLIC(int) tmgr_trace_event_free(tmgr_trace_iterator_t trace_event);
 
-XBT_PUBLIC(tmgr_trace_event_t) tmgr_history_add_trace(tmgr_history_t
+XBT_PUBLIC(tmgr_trace_iterator_t) tmgr_history_add_trace(tmgr_fes_t
                                                       history,
                                                       tmgr_trace_t trace,
                                                       double start_time,
@@ -36,11 +38,13 @@ XBT_PUBLIC(tmgr_trace_event_t) tmgr_history_add_trace(tmgr_history_t
                                                       void *model);
 
 /* Access functions */
-XBT_PUBLIC(double) tmgr_history_next_date(tmgr_history_t history);
-XBT_PUBLIC(tmgr_trace_event_t)
-    tmgr_history_get_next_event_leq(tmgr_history_t history, double date,
+XBT_PUBLIC(double) tmgr_history_next_date(tmgr_fes_t history);
+XBT_PUBLIC(tmgr_trace_iterator_t)
+    tmgr_history_get_next_event_leq(tmgr_fes_t history, double date,
                                 double *value, void **model);
 
 XBT_PUBLIC(void) tmgr_finalize(void);
 
+SG_END_DECL()
+
 #endif                          /* _SURF_TMGR_H */