surf/trace: kill dead code

diff --git a/src/include/surf/datatypes.h b/src/include/surf/datatypes.h
index a027f23..1a19b75 100644 (file)
--- a/src/include/surf/datatypes.h
+++ b/src/include/surf/datatypes.h
@@ -16,6 +16,4 @@ typedef struct lmm_constraint *lmm_constraint_t;
 typedef struct lmm_constraint_light *lmm_constraint_light_t;
 typedef struct lmm_system *lmm_system_t;
 
-typedef struct tmgr_trace_iterator *tmgr_trace_iterator_t;
-
 #endif                          /* MAXMIN_DATATYPES_H */

diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index ffb7620..8fb7dd8 100644 (file)
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -8,50 +8,16 @@
 #define _SURF_TMGR_H
 
 #include "xbt/heap.h"
-#include "xbt/dynar.h"
-#include "surf/maxmin.h"
-#include "surf/datatypes.h"
 #include "simgrid/forward.h"
 
 SG_BEGIN_DECL()
-#include "xbt/base.h"
-#include "xbt/swag.h"
 #include "xbt/heap.h"
-#include "trace_mgr.hpp"
-#include "xbt/RngStream.h"
 
 typedef struct tmgr_event {
   double delta;
   double value;
 } s_tmgr_event_t, *tmgr_event_t;
 
-enum e_trace_type {
-  e_trace_list, e_trace_probabilist
-};
-
-enum e_event_generator_type {
-  e_generator_uniform, e_generator_exponential, e_generator_weibull
-};
-
-typedef struct probabilist_event_generator {
-  enum e_event_generator_type type;
-  RngStream rng_stream;
-  double next_value;
-  union {
-    struct {
-      double min;
-      double max;
-    } s_uniform_parameters;
-    struct {
-      double rate;
-    } s_exponential_parameters;
-    struct {
-      double scale;
-      double shape;
-    } s_weibull_parameters;
-  };
-} s_probabilist_event_generator_t;
-
 typedef struct tmgr_trace {
   xbt_dynar_t event_list;
 } s_tmgr_trace_t;
@@ -63,6 +29,7 @@ typedef struct tmgr_trace_iterator {
   sg_resource_t resource;
   int free_me;
 } s_tmgr_trace_event_t;
+typedef struct tmgr_trace_iterator *tmgr_trace_iterator_t;
 
 /* Creation functions */
 XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void);

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index c571dcc..f3c11b3 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -240,9 +240,6 @@ typedef struct s_sg_platf_AS_cbarg {
 
 #define SG_PLATF_AS_INITIALIZER {NULL,0}
 
-/** opaque structure defining a event generator for availability based on a probability distribution */
-typedef struct probabilist_event_generator *probabilist_event_generator_t;
-
 /********** Routing **********/
 void routing_cluster_add_backbone(Link* bb);
 /*** END of the parsing cruft ***/