Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
explain in comment why we don't even test pthread on windows
[simgrid.git] / src / include / surf / trace_mgr.h
index 3343492..2598b77 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2007, 2009-2012. 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
 #include "surf/datatypes.h"
 #include "simgrid/platf_interface.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+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_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
@@ -30,9 +28,9 @@ XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace);
  * \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,
@@ -40,15 +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);
 
-#ifdef __cplusplus
-}
-#endif
+SG_END_DECL()
 
 #endif                          /* _SURF_TMGR_H */