Cosmetics

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@512 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h
index 9773846..91aa8d9 100644 (file)
--- a/src/include/surf/trace_mgr.h
+++ b/src/include/surf/trace_mgr.h
@@ -20,15 +20,15 @@ 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);
 
-void tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t trace, 
-                           xbt_heap_float_t start_time, int offset, 
+void tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t trace,
+                           xbt_heap_float_t start_time, int offset,
                            void *resource);
 
 /* Access functions */
 xbt_heap_float_t tmgr_history_next_date(tmgr_history_t history);
 int tmgr_history_get_next_event_leq(tmgr_history_t history,
                                    xbt_heap_float_t date,
-                                   xbt_maxmin_float_t *value,
+                                   xbt_maxmin_float_t * value,
                                    void **resource);
 
 #endif                         /* _SURF_TMGR_H */

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index c9ac6a9..0fc4fe7 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -19,9 +19,9 @@ tmgr_history_t tmgr_history_new(void)
 {
   tmgr_history_t history;
 
-  history = xbt_new0(s_tmgr_history_t,1);
+  history = xbt_new0(s_tmgr_history_t, 1);
 
-  history->heap = xbt_heap_new(8,NULL); /* Why 8 ? Well, why not... */
+  history->heap = xbt_heap_new(8, xbt_free);   /* Why 8 ? Well, why not... */
 
   return history;
 }
@@ -38,15 +38,16 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
   FILE *f = NULL;
   int linecount = 0;
   char line[256];
-  xbt_heap_float_t current_time=0.0, previous_time = 0.0;
-  xbt_maxmin_float_t value=-1.0;
-  xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */
+  xbt_heap_float_t current_time = 0.0, previous_time = 0.0;
+  xbt_maxmin_float_t value = -1.0;
+  xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */
   s_tmgr_event_t event;
   tmgr_event_t last_event = NULL;
 
-  if(trace_list) {
+  if (trace_list) {
     xbt_dict_get(trace_list, filename, (void **) &trace);
-    if(trace) return trace;
+    if (trace)
+      return trace;
   }
 
   /* Parsing et création de la trace */
@@ -56,17 +57,19 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
     return NULL;
   }
 
-  trace = xbt_new0(s_tmgr_trace_t,1);
-  trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t),NULL);
+  trace = xbt_new0(s_tmgr_trace_t, 1);
+  trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
 
   while (fgets(line, 256, f)) {
     linecount++;
     if ((line[0] == '#') || (line[0] == '\n') || (line[0] == '%'))
       continue;
 
-    if (sscanf(line, "PERIODICITY " XBT_HEAP_FLOAT_T "\n", &(periodicity)) == 1){
-      if(periodicity<=0) {
-       fprintf(stderr, "%s,%d: Syntax error. Periodicity has to be positive\n", 
+    if (sscanf(line, "PERIODICITY " XBT_HEAP_FLOAT_T "\n", &(periodicity))
+       == 1) {
+      if (periodicity <= 0) {
+       fprintf(stderr,
+               "%s,%d: Syntax error. Periodicity has to be positive\n",
                filename, linecount);
        abort();
 /*     xbt_dynar_free(&(trace->event_list)); */
@@ -76,61 +79,69 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
       continue;
     }
 
-    if (sscanf(line, XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", &event.delta, &event.value) != 2){
+    if (sscanf
+       (line, XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", &event.delta,
+        &event.value) != 2) {
       fprintf(stderr, "%s,%d: Syntax error\n", filename, linecount);
       abort();
 /*       xbt_dynar_free(&(trace->event_list)); */
 /*       xbt_free(trace);       */
 /*       return NULL; */
     }
-    
-    if(last_event) {
-      if((last_event->delta=event.delta-last_event->delta) <=0) {
-       fprintf(stderr, "%s,%d: Invalid trace value, events have to be sorted\n", 
+
+    if (last_event) {
+      if ((last_event->delta = event.delta - last_event->delta) <= 0) {
+       fprintf(stderr,
+               "%s,%d: Invalid trace value, events have to be sorted\n",
                filename, linecount);
        abort();
       }
     }
     xbt_dynar_push(trace->event_list, &event);
     last_event = xbt_dynar_get_ptr(trace->event_list,
-                                  xbt_dynar_length(trace->event_list)-1);
-    printf(XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n",
-          event.delta, event.value);
+                                  xbt_dynar_length(trace->event_list) -
+                                  1);
+    printf(XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", event.delta,
+          event.value);
   }
 
-  if(periodicity>0) {
-    if(last_event)
-      last_event->delta=periodicity;
+  if (periodicity > 0) {
+    if (last_event)
+      last_event->delta = periodicity;
   }
 
-  if(!trace_list) trace_list =  xbt_dict_new();
+  if (!trace_list)
+    trace_list = xbt_dict_new();
 
   xbt_dict_set(trace_list, filename, (void *) trace, _tmgr_trace_free);
- 
+
+  fclose(f);
+
   return trace;
 }
 
 
 void tmgr_trace_free(tmgr_trace_t trace)
 {
-  if(!trace) return;
+  if (!trace)
+    return;
   xbt_dynar_free(&(trace->event_list));
   xbt_free(trace);
 }
 
-void tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t trace, 
-                           xbt_heap_float_t start_time, int offset, 
+void tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t trace,
+                           xbt_heap_float_t start_time, int offset,
                            void *resource)
 {
   tmgr_trace_event_t trace_event = NULL;
 
-  
-  trace_event = xbt_new0(s_tmgr_trace_event_t,1);
-  trace_event->trace=trace;
-  trace_event->idx=offset;
-  trace_event->resource=resource;
 
-  if(trace_event->idx>= xbt_dynar_length(trace->event_list))
+  trace_event = xbt_new0(s_tmgr_trace_event_t, 1);
+  trace_event->trace = trace;
+  trace_event->idx = offset;
+  trace_event->resource = resource;
+
+  if (trace_event->idx >= xbt_dynar_length(trace->event_list))
     abort();
 
   xbt_heap_push(history->heap, trace_event, start_time);
@@ -138,13 +149,15 @@ void tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t trace,
 
 xbt_heap_float_t tmgr_history_next_date(tmgr_history_t history)
 {
-  if(xbt_heap_size(history->heap)) return(xbt_heap_maxkey(history->heap));
-  else return -1.0;
+  if (xbt_heap_size(history->heap))
+    return (xbt_heap_maxkey(history->heap));
+  else
+    return -1.0;
 }
 
 int tmgr_history_get_next_event_leq(tmgr_history_t history,
                                    xbt_heap_float_t date,
-                                   xbt_maxmin_float_t *value,
+                                   xbt_maxmin_float_t * value,
                                    void **resource)
 {
   xbt_heap_float_t event_date = xbt_heap_maxkey(history->heap);
@@ -152,29 +165,26 @@ int tmgr_history_get_next_event_leq(tmgr_history_t history,
   tmgr_event_t event = NULL;
   tmgr_trace_t trace = NULL;
 
-  if(event_date > date) 
+  if (event_date > date)
     return 0;
-  
-  if(!(trace_event = xbt_heap_pop(history->heap)))
+
+  if (!(trace_event = xbt_heap_pop(history->heap)))
     return 0;
-  
-  trace=trace_event->trace;
-  event=xbt_dynar_get_ptr(trace->event_list,
-                         trace_event->idx);
+
+  trace = trace_event->trace;
+  event = xbt_dynar_get_ptr(trace->event_list, trace_event->idx);
 
 
-  *value=event->value;
+  *value = event->value;
   *resource = trace_event->resource;
 
-  if(trace_event->idx<xbt_dynar_length(trace->event_list)-1) {
-    xbt_heap_push(history->heap, trace_event, event_date + 
-                 event->delta);
+  if (trace_event->idx < xbt_dynar_length(trace->event_list) - 1) {
+    xbt_heap_push(history->heap, trace_event, event_date + event->delta);
     trace_event->idx++;
-  } else if(event->delta > 0) { /* Last element, checking for periodicity */
-    xbt_heap_push(history->heap, trace_event, event_date + 
-                 event->delta);
-    trace_event->idx=0;
-  } else { /* We don't need this trace_event anymore */
+  } else if (event->delta > 0) {       /* Last element, checking for periodicity */
+    xbt_heap_push(history->heap, trace_event, event_date + event->delta);
+    trace_event->idx = 0;
+  } else {                     /* We don't need this trace_event anymore */
     xbt_free(trace_event);
   }
 

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index c203163..b7267b7 100644 (file)
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -14,9 +14,9 @@ void test(void);
 void test(void)
 {
   tmgr_history_t history = tmgr_history_new();
-  tmgr_trace_t trace_A= tmgr_trace_new("trace_A.txt");
-  tmgr_trace_t trace_B= tmgr_trace_new("trace_B.txt");
-  xbt_heap_float_t next_event_date=-1.0;
+  tmgr_trace_t trace_A = tmgr_trace_new("trace_A.txt");
+  tmgr_trace_t trace_B = tmgr_trace_new("trace_B.txt");
+  xbt_heap_float_t next_event_date = -1.0;
   xbt_maxmin_float_t value = -1.0;
   char *resource = NULL;
   char *host_A = strdup("Host A");
@@ -24,20 +24,23 @@ void test(void)
 
   tmgr_history_add_trace(history, trace_A, 1.0, 2, host_A);
   tmgr_history_add_trace(history, trace_B, 0.0, 0, host_B);
-  
-  while((next_event_date=tmgr_history_next_date(history))!=-1.0) {
-    printf(XBT_HEAP_FLOAT_T " : \n",next_event_date);
-    while(tmgr_history_get_next_event_leq(history, next_event_date,
-                                         &value, (void**) &resource)){
-      printf("\t %s : " XBT_MAXMIN_FLOAT_T "\n",resource,value);
+
+  while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+    printf(XBT_HEAP_FLOAT_T " : \n", next_event_date);
+    while (tmgr_history_get_next_event_leq(history, next_event_date,
+                                          &value, (void **) &resource)) {
+      printf("\t %s : " XBT_MAXMIN_FLOAT_T "\n", resource, value);
     }
-    if(next_event_date>1000) break;
+    if (next_event_date > 1000)
+      break;
   }
 
   tmgr_trace_free(trace_A);
   tmgr_trace_free(trace_B);
   tmgr_history_free(history);
-} 
+  free(host_B);
+  free(host_A);
+}
 
 
 int main(int argc, char **argv)