X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e1a18a0b8d75deb509860d08b75a27df4e935c8..aceb880ccaea97ba93e72cc862ba5954c85f321b:/src/surf/trace_mgr.hpp

diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index 7784e7f807..cc9c16ee52 100644
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -1,27 +1,23 @@
-/* Copyright (c) 2004-2007, 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2017. 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 _SURF_TMGR_H
-#define _SURF_TMGR_H
+#ifndef SURF_TMGR_H
+#define SURF_TMGR_H
 
-#include "xbt/heap.h"
 #include "simgrid/forward.h"
+#include "xbt/heap.h"
+#include "xbt/sysdep.h"
+#include <vector>
 
 SG_BEGIN_DECL()
-#include "xbt/heap.h"
 
 typedef struct tmgr_event {
   double delta;
   double value;
 } s_tmgr_event_t, *tmgr_event_t;
 
-typedef struct tmgr_trace {
-
-} s_tmgr_trace_t;
-
 /* Iterator within a trace */
 typedef struct tmgr_trace_iterator {
   tmgr_trace_t trace;
@@ -45,8 +41,8 @@ XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event);
 
 XBT_PUBLIC(void) tmgr_finalize(void);
 
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(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_trace_new_from_file(const char* filename);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string input, double periodicity);
 
 SG_END_DECL()
 
@@ -69,7 +65,7 @@ XBT_PUBLIC_CLASS trace_iterator {
 /** @brief A trace is a set of timed values, encoding the value that a variable takes at what time *
  *
  * It is useful to model dynamic platforms, where an external load that makes the resource availability change over time.
- * To model that, you have to set several traces per resource: one for the on/off state and one for each numerical value (computational speed, bandwidt and latency).
+ * To model that, you have to set several traces per resource: one for the on/off state and one for each numerical value (computational speed, bandwidth and latency).
  */
 XBT_PUBLIC_CLASS trace {
 public:
@@ -77,7 +73,7 @@ public:
   trace();
   virtual ~trace();
 //private:
-  xbt_dynar_t event_list;
+  std::vector<s_tmgr_event_t> event_list;
 };
 
 /** @brief Future Event Set (collection of iterators over the traces)
@@ -98,4 +94,4 @@ private:
 }} // namespace simgrid::trace_mgr
 #endif /* C++ only */
 
-#endif                          /* _SURF_TMGR_H */
+#endif /* SURF_TMGR_H */