some more renamings in the traces

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 03f5ef4..e421353 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -386,14 +386,14 @@ XBT_INLINE void tmgr_trace_free(tmgr_trace_t trace)
 tmgr_trace_iterator_t tmgr_history_add_trace(tmgr_fes_t h,
                                           tmgr_trace_t trace,
                                           double start_time,
 tmgr_trace_iterator_t tmgr_history_add_trace(tmgr_fes_t h,
                                           tmgr_trace_t trace,
                                           double start_time,

-                                          unsigned int offset, void *model)
+                                          unsigned int offset, void *resource)

 {
   tmgr_trace_iterator_t trace_iterator = NULL;
 
   trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
   trace_iterator->trace = trace;
   trace_iterator->idx = offset;
 {
   tmgr_trace_iterator_t trace_iterator = NULL;
 
   trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
   trace_iterator->trace = trace;
   trace_iterator->idx = offset;

-  trace_iterator->model = model;
+  trace_iterator->resource = resource;

 
   if(trace->type == e_trace_list) {
     xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->s_list.event_list)),
 
   if(trace->type == e_trace_list) {
     xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->s_list.event_list)),


@@ -416,7 +416,7 @@ XBT_INLINE double tmgr_history_next_date(tmgr_fes_t h)
 tmgr_trace_iterator_t tmgr_history_get_next_event_leq(tmgr_fes_t h,
                                                    double date,
                                                    double *value,
 tmgr_trace_iterator_t tmgr_history_get_next_event_leq(tmgr_fes_t h,
                                                    double date,
                                                    double *value,

-                                                   void **model)
+                                                   void** resource)

 {
   double event_date = tmgr_history_next_date(h);
   tmgr_trace_iterator_t trace_iterator = NULL;
 {
   double event_date = tmgr_history_next_date(h);
   tmgr_trace_iterator_t trace_iterator = NULL;


@@ -431,7 +431,7 @@ tmgr_trace_iterator_t tmgr_history_get_next_event_leq(tmgr_fes_t h,
     return NULL;
 
   trace = trace_iterator->trace;
     return NULL;
 
   trace = trace_iterator->trace;

-  *model = trace_iterator->model;
+  *resource = trace_iterator->resource;

 
   switch(trace->type) {
     case e_trace_list:
 
   switch(trace->type) {
     case e_trace_list:

diff --git a/src/surf/trace_mgr_private.h b/src/surf/trace_mgr_private.h
index 184d998..d05ba5b 100644 (file)
--- a/src/surf/trace_mgr_private.h
+++ b/src/surf/trace_mgr_private.h
@@ -63,7 +63,7 @@ typedef struct tmgr_trace {
 typedef struct tmgr_trace_iterator {
   tmgr_trace_t trace;
   unsigned int idx;
 typedef struct tmgr_trace_iterator {
   tmgr_trace_t trace;
   unsigned int idx;

-  void *model;
+  void *resource;

   int free_me;
 } s_tmgr_trace_event_t;
 
   int free_me;
 } s_tmgr_trace_event_t;