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

diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h
index bcb8ef81f1..394cddca52 100644
--- a/src/include/surf/trace_mgr.h
+++ b/src/include/surf/trace_mgr.h
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 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. */
@@ -11,30 +10,41 @@
 #include "xbt/heap.h"
 #include "xbt/dynar.h"
 #include "surf/maxmin.h"
-
-typedef struct tmgr_history *tmgr_history_t;
-typedef struct tmgr_trace *tmgr_trace_t;
-typedef struct tmgr_trace_event *tmgr_trace_event_t;
+#include "surf/datatypes.h"
+#include "simgrid/platf_interface.h"
 
 /* Creation functions */
-tmgr_history_t tmgr_history_new(void);
-void tmgr_history_free(tmgr_history_t history);
-
-tmgr_trace_t tmgr_trace_new(const char *filename);
-void tmgr_trace_free(tmgr_trace_t trace);
-
-tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t history,
-					  tmgr_trace_t trace,
-					  double start_time, int offset,
-					  void *resource);
+XBT_PUBLIC(tmgr_history_t) tmgr_history_new(void);
+XBT_PUBLIC(void) tmgr_history_free(tmgr_history_t history);
+
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new(const char *filename);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id,
+                                                    const char *input,
+                                                    double periodicity);
+XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void);
+XBT_INLINE 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
+ * \return 1 if the structure was freed, 0 otherwise
+*/
+XBT_PUBLIC(int) tmgr_trace_event_free(tmgr_trace_event_t trace_event);
+
+XBT_PUBLIC(tmgr_trace_event_t) tmgr_history_add_trace(tmgr_history_t
+                                                      history,
+                                                      tmgr_trace_t trace,
+                                                      double start_time,
+                                                      unsigned int offset,
+                                                      void *model);
 
 /* Access functions */
-double tmgr_history_next_date(tmgr_history_t history);
-tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t history,
-						   double date,
-						   double *value,
-						   void **resource);
+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,
+                                double *value, void **model);
 
-void tmgr_finalize(void);
+XBT_PUBLIC(void) tmgr_finalize(void);
 
-#endif				/* _SURF_TMGR_H */
+#endif                          /* _SURF_TMGR_H */